Merge branch 'dev_7.2' into dev_commodity

CommonLib/Common/src/main/java/com/yidian/common/http/URLs.kt

@@ -21,6 +21,8 @@ class URLs {
         const val userInfo = "/user/user/info"
 
         // 生活圈B端
+        const val getShopList = "/shop/shop/get_shop_list"
+        const val updateShop = "/shop/shop/update_shop"
         const val uploadFile = "/user/user/modify_profile"
         const val pushTokenAndroid = "/push/token/android"
         const val authPersonalGetToken = "/Identify/IdOcr/getBizToken"

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/adapter/StoreAdapter.kt

@@ -4,10 +4,9 @@ import android.content.Context
 import android.content.Intent
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import android.widget.Toast
 import androidx.recyclerview.widget.RecyclerView
 import com.yidian.shenghuoquan.newscontent.R
-import com.yidian.shenghuoquan.newscontent.bean.Store
+import com.yidian.shenghuoquan.newscontent.http.httpbean.GetShopListBean
 import com.yidian.shenghuoquan.newscontent.ui.EditStoreActivity
 import com.yidian.shenghuoquan.newscontent.viewholder.StoreViewHolder
 
@@ -16,24 +15,45 @@ import com.yidian.shenghuoquan.newscontent.viewholder.StoreViewHolder
  * Date: 2021/6/22 3:15 PM
  * Describe:
  */
-class StoreAdapter(private val context: Context, private val dataList: ArrayList<Store>) : RecyclerView.Adapter<StoreViewHolder>() {
+class StoreAdapter(private val context: Context) : RecyclerView.Adapter<StoreViewHolder>() {
+  private lateinit var data: ArrayList<GetShopListBean>
+
   override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): StoreViewHolder {
     val view = LayoutInflater.from(context).inflate(R.layout.store_management_item, parent, false)
     return StoreViewHolder(view)
   }
 
   override fun onBindViewHolder(holder: StoreViewHolder, position: Int) {
-    val store = dataList[position]
+    val store = data[position]
     holder.setData(store, position)
     holder.setOnListener(object : HolderListener {
       override fun jump() {
-        context.startActivity(Intent(context, EditStoreActivity::class.java))
+        var intent = Intent(context, EditStoreActivity::class.java)
+        intent.putExtra("shop_name", store.shop_name)
+        intent.putExtra("sub_shop_id", store.sub_shop_id)
+        intent.putExtra("address", store.address)
+        intent.putExtra("phone", store.phone)
+        intent.putExtra("latitude", store.latitude)
+        intent.putExtra("longitude", store.longitude)
+        context.startActivity(intent)
       }
     })
   }
 
   override fun getItemCount(): Int {
-    return dataList.size
+
+    return if (::data.isInitialized) {
+      data.size
+    } else {
+      0
+    }
+
+  }
+
+  fun setData(it: ArrayList<GetShopListBean>) {
+    this.data = it
+
+    notifyDataSetChanged()
   }
 
   interface HolderListener {

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/bean/Store.kt

-package com.yidian.shenghuoquan.newscontent.bean
-
-/**
- * Author: sym
- * Date: 2021/6/22 3:18 PM
- * Describe:
- */
-class Store(var title: String)
-
-object StoreDataList {
-
-  val data = arrayListOf(
-    Store("Cherry"),
-    Store("Grape"),
-    Store("Mango"),
-    Store("Orange"),
-    Store("Pear"),
-    Store("Pineapple"),
-    Store("Strawberry"),
-    Store("Watermelon")
-  )
-
-}

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/ApiService.kt

@@ -496,5 +496,43 @@ class ApiService {
 
         })
     }
+
+      fun updateStore(requestParams: HashMap<String, String?>,callback: ((Boolean) -> Unit)? = null) {
+      val timeStamp = System.currentTimeMillis()
+      val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
+      val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(requestParams, timeStamp)
+      ServiceFactory.getInstance().createService(CommonService::class.java)
+        .updateShop(publicParamsMap, privateParamsMap)
+        .compose(TransformUtil.defaultSchedulers())
+        .subscribe(object : HttpResultSubscriber<Any?>() {
+          override fun onSuccess(result: HttpResult<Any?>?) {
+            callback?.invoke(true)
+
+          }
+
+          override fun onFailer(result: HttpResult<Any?>?) {
+
+          }
+        })
+      }
+
+    fun getShopList(requestParams: HashMap<String, String?>, callback: ((ArrayList<GetShopListBean>) -> Unit)? = null) {
+      val timeStamp = System.currentTimeMillis()
+      val publicParamsMap = HttpParamsUtils.getPublicParamsMap(timeStamp)
+      val privateParamsMap = HttpParamsUtils.getPrivateParamsMap(requestParams, timeStamp)
+      ServiceFactory.getInstance().createService(CommonService::class.java)
+        .getShopList(publicParamsMap, privateParamsMap)
+        .compose(TransformUtil.defaultSchedulers())
+        .subscribe(object : HttpResultSubscriber<ArrayList<GetShopListBean>?>() {
+          override fun onSuccess(result: HttpResult<ArrayList<GetShopListBean>?>?) {
+            callback?.invoke(result!!.result!!)
+
+          }
+
+          override fun onFailer(result: HttpResult<ArrayList<GetShopListBean>?>?) {
+          }
+        })
+    }
+
   }
 }

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/CommonService.kt

@@ -146,4 +146,18 @@ interface CommonService {
     @QueryMap commonParams: Map<String, String>,
     @Body requestParams: Map<String, String?>
   ): Observable<HttpResult<Any?>>
+
+  @Headers("Content-Type: application/json")
+  @POST(URLs.updateShop)
+  fun updateShop(
+    @QueryMap commonParams: Map<String, String>,
+    @Body requestParams: Map<String, String?>
+  ): Observable<HttpResult<Any?>>
+
+  @Headers("Content-Type: application/json")
+  @POST(URLs.getShopList)
+  fun getShopList(
+    @QueryMap commonParams: Map<String, String>,
+    @Body requestParams: Map<String, String?>
+  ): Observable<HttpResult<Any?>>
 }

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/httpbean/GetShopListBean.kt

+package com.yidian.shenghuoquan.newscontent.http.httpbean
+
+/**
+ * Author: sym
+ * Date: 2021/6/29 4:24 PM
+ * Describe:
+ */
+data class GetShopListBean(
+    val address: String,
+    val create_time: String,
+    val latitude: String,
+    val life_account_id: String,
+    val longitude: String,
+    val phone: String,
+    val shop_id: String,
+    val shop_name: String,
+    val sub_shop_id: String,
+    val update_time: String
+)

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/EditStoreActivity.kt

@@ -5,6 +5,8 @@ import android.os.Bundle
 import android.widget.Toast
 import com.yidian.common.base.BaseActivity
 import com.yidian.shenghuoquan.newscontent.databinding.ActivityStoreEditBinding
+import com.yidian.shenghuoquan.newscontent.http.ApiService
+import com.yidian.shenghuoquan.newscontent.utils.StorageUtil
 import com.yidian.shenghuoquan.newscontent.widget.CommonTopBarView
 
 /**
@@ -13,6 +15,8 @@ import com.yidian.shenghuoquan.newscontent.widget.CommonTopBarView
  * Describe:
  */
 class EditStoreActivity : BaseActivity<ActivityStoreEditBinding>(), CommonTopBarView.OnCommonTopBarActionCallback {
+  private var store = Store("", "", "", "", "", "")
+
   override fun createViewBinding(): ActivityStoreEditBinding {
     return ActivityStoreEditBinding.inflate(layoutInflater)
   }
@@ -27,10 +31,30 @@ class EditStoreActivity : BaseActivity<ActivityStoreEditBinding>(), CommonTopBar
     }
 
     viewBind.bvTopBar.setOnCommonTopBarCallback(null, this)
+
+    if (intent != null && intent.getStringExtra("phone") !== null) {
+      viewBind.storePhoneNum.setText(intent.getStringExtra("phone"))
+      viewBind.storeAddressEdit.setText(intent.getStringExtra("address"))
+      viewBind.storeName.setText(intent.getStringExtra("shop_name"))
+      store.sub_shop_id = intent.getStringExtra("sub_shop_id")
+    }
   }
 
   override fun onDoAction() {
-    Toast.makeText(this@EditStoreActivity, "save", Toast.LENGTH_SHORT).show()
+    val requestParams = HashMap<String, String?>()
+    requestParams["sub_shop_id"] = store.sub_shop_id
+    requestParams["life_account_id"] = StorageUtil.getLifeAccountId()
+    requestParams["phone"] = viewBind.storePhoneNum.text.toString()
+    requestParams["shop_id"] = ""
+    requestParams["shop_name"] = viewBind.storeName.text.toString()
+    requestParams["latitude"] = store.latitude
+    requestParams["longitude"] = store.longitude
+    requestParams["address"] = store.title
+    ApiService.updateStore(requestParams) {
+      if (it) {
+        Toast.makeText(this@EditStoreActivity, "保存成功", Toast.LENGTH_SHORT).show()
+      }
+    }
   }
 
 
@@ -38,17 +62,20 @@ class EditStoreActivity : BaseActivity<ActivityStoreEditBinding>(), CommonTopBar
     super.onActivityResult(requestCode, resultCode, data)
     if (resultCode == 200) {
       viewBind.storeAddressEdit.text = data!!.getStringExtra("title")
+      store.title = data!!.getStringExtra("title")
+      store.latitude = data!!.getStringExtra("latitude")
+      store.longitude = data!!.getStringExtra("longitude")
     }
 
-//  override fun onActivityReenter(resultCode: Int, data: Intent?) {
-//    super.onActivityReenter(resultCode, data)
-//    if (resultCode == 200) {
-//      viewBind.storeAddressEdit.text = intent.getStringExtra("title")
-//
-////      resultIntent.putExtra("title", data[position].title)
-////      resultIntent.putExtra("cityName", data[position].cityName)
-////      resultIntent.putExtra("adName", data[position].adName)
-////      resultIntent.putExtra("latLonPoint", data[position].latLonPoint)
-//    }
+
   }
+
+  data class Store(
+    var title: String,
+    var cityName: String,
+    var adName: String,
+    var latitude: String,
+    var longitude: String,
+    var sub_shop_id: String
+  )
 }

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/SearchAddActivity.kt

@@ -38,7 +38,8 @@ class SearchAddActivity : BaseActivity<LayoutActivityServiceProductAddrSearchBin
       resultIntent.putExtra("title", data[position].title)
       resultIntent.putExtra("cityName", data[position].cityName)
       resultIntent.putExtra("adName", data[position].adName)
-      resultIntent.putExtra("latLonPoint", data[position].latLonPoint)
+      resultIntent.putExtra("latitude", data[position].latLonPoint.latitude.toString())
+      resultIntent.putExtra("longitude", data[position].latLonPoint.longitude.toString())
       setResult(100, resultIntent)
       finish()
     }

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/SelectAddressActivity.kt

@@ -55,7 +55,8 @@ class SelectAddressActivity : BaseActivity<ActivitySelectAddressBinding>(), OnMy
       resultIntent.putExtra("title", data[position].title)
       resultIntent.putExtra("cityName", data[position].cityName)
       resultIntent.putExtra("adName", data[position].adName)
-      resultIntent.putExtra("latLonPoint", data[position].latLonPoint)
+      resultIntent.putExtra("latitude", data[position].latLonPoint.latitude.toString())
+      resultIntent.putExtra("longitude", data[position].latLonPoint.longitude.toString())
       setResult(200, resultIntent)
       finish()
     }

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/StoreManagementActivity.kt

 package com.yidian.shenghuoquan.newscontent.ui
 
+import android.content.Intent
 import android.os.Bundle
-import android.widget.Toast
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.yidian.common.XRouterPathConstants.Companion.STORE_MANAGEMENT
 import com.yidian.common.base.BaseActivity
 import com.yidian.shenghuoquan.newscontent.adapter.StoreAdapter
-import com.yidian.shenghuoquan.newscontent.bean.StoreDataList
 import com.yidian.shenghuoquan.newscontent.databinding.ActivityStoreManagementBinding
+import com.yidian.shenghuoquan.newscontent.http.ApiService
+import com.yidian.shenghuoquan.newscontent.utils.StorageUtil
 
 /**
  * Author: sym
@@ -15,6 +16,7 @@ import com.yidian.shenghuoquan.newscontent.databinding.ActivityStoreManagementBi
  * Describe:
  */
 class StoreManagementActivity : BaseActivity<ActivityStoreManagementBinding>() {
+  private lateinit var adapter:StoreAdapter
   override fun createViewBinding(): ActivityStoreManagementBinding {
     return ActivityStoreManagementBinding.inflate(layoutInflater)
   }
@@ -29,12 +31,20 @@ class StoreManagementActivity : BaseActivity<ActivityStoreManagementBinding>() {
     layoutManager.orientation = LinearLayoutManager.VERTICAL
     viewBind.storeList.layoutManager = layoutManager
 
-    val adapter = StoreAdapter(this, StoreDataList.data)
+    adapter = StoreAdapter(this)
     viewBind.storeList.adapter = adapter
 
     viewBind.addStoreBtn.setOnClickListener {
-      Toast.makeText(this@StoreManagementActivity, "StoreManagementActivity", Toast.LENGTH_SHORT).show()
+      startActivity(Intent(this@StoreManagementActivity, EditStoreActivity::class.java))
+    }
   }
 
+  override fun onResume() {
+    super.onResume()
+    val requestParams = HashMap<String, String?>()
+    requestParams["life_account_id"] = StorageUtil.getLifeAccountId()
+    ApiService.getShopList(requestParams) {
+      adapter.setData(it)
+    }
   }
 }

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/viewholder/StoreViewHolder.kt

 package com.yidian.shenghuoquan.newscontent.viewholder
 
 import android.view.View
+import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
+import com.yidian.shenghuoquan.newscontent.R
 import com.yidian.shenghuoquan.newscontent.adapter.StoreAdapter
-import com.yidian.shenghuoquan.newscontent.bean.Store
+import com.yidian.shenghuoquan.newscontent.http.httpbean.GetShopListBean
 
 /**
  * Author: sym
@@ -13,10 +15,13 @@ import com.yidian.shenghuoquan.newscontent.bean.Store
 class StoreViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
   private lateinit var listener: StoreAdapter.HolderListener
 
-  fun setData(data: Store, pos: Int) {
-    /* val title =  itemView.findViewById<TextView>(R.id.tvTitle)
-     title.text = hobby?.title */
-
+  fun setData(data: GetShopListBean, pos: Int) {
+    val title = itemView.findViewById<TextView>(R.id.store_name)
+    val phone = itemView.findViewById<TextView>(R.id.store_phone)
+    val address = itemView.findViewById<TextView>(R.id.store_address)
+    title.text = data.shop_name
+    phone.text = data.phone
+    address.text = data.address
   }
 
   fun setOnListener(deleteListener: StoreAdapter.HolderListener) {

Components/newscontent/src/main/res/layout/activity_store_edit.xml

@@ -36,15 +36,18 @@
                 android:textColor="#4D4C4D"
                 android:textSize="16sp" />
 
-            <TextView
+
+            <EditText
+                android:id="@+id/store_name"
                 android:layout_width="247dp"
                 android:layout_height="24dp"
                 android:layout_gravity="center_vertical|left"
-                android:fontFamily="PingFangSC"
-                android:text="一点资讯生活号"
-                android:textColor="#FF333333"
-                android:textSize="16sp"
-                android:textStyle="bold" />
+                android:background="@null"
+                android:textStyle="bold"
+                android:maxLength="13"
+                android:textColor="#333333"
+                android:textSize="16sp" />
+
         </LinearLayout>
 
 
@@ -77,7 +80,6 @@
                 android:ellipsize="end"
                 android:fontFamily="PingFangSC"
                 android:maxLines="2"
-                android:text="朝阳区恒通国际创新园C7一点资讯北侧C7一点资讯北侧C7..."
                 android:textColor="#FF333333"
                 android:textSize="16sp"
                 android:textStyle="bold" />
@@ -115,15 +117,18 @@
                 android:textColor="#4D4C4D"
                 android:textSize="16sp" />
 
-            <TextView
+            <EditText
+                android:id="@+id/store_phone_num"
                 android:layout_width="247dp"
                 android:layout_height="24dp"
                 android:layout_gravity="center_vertical|left"
-                android:fontFamily="PingFangSC"
-                android:text="13093489384"
-                android:textColor="#FF333333"
-                android:textSize="16sp"
-                android:textStyle="bold" />
+                android:background="@null"
+                android:textStyle="bold"
+                android:inputType="number"
+                android:maxLength="13"
+                android:textColor="#333333"
+                android:textSize="16sp" />
+
         </LinearLayout>
 
         <LinearLayout

Components/newscontent/src/main/res/layout/store_management_item.xml

@@ -18,6 +18,7 @@
         android:layout_toLeftOf="@id/store_edit_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
         android:layout_centerVertical="true"
         android:orientation="vertical"
         android:paddingStart="23dp">
@@ -27,7 +28,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:includeFontPadding="false"
-            android:text="一点资讯生活号实体店1分店"
             android:textColor="#FF333333"
             android:textSize="16sp"
             android:textStyle="bold" />
@@ -40,7 +40,6 @@
             android:ellipsize="end"
             android:includeFontPadding="false"
             android:maxLines="2"
-            android:text="朝阳区恒通国际创新园C7一点资讯北侧.朝阳区恒通国际创新园C7一点资讯北侧.朝阳区恒通国际创新园C7一点资讯北侧"
             android:textColor="#9d9d9d"
             android:textSize="12sp" />
 
@@ -50,7 +49,6 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
             android:includeFontPadding="false"
-            android:text="13888888888"
             android:textColor="#9d9d9d"
             android:textSize="12sp" />