add 添加编辑门店接口

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

@@ -21,6 +21,7 @@ class URLs {
         const val userInfo = "/user/user/info"
 
         // 生活圈B端
+        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/http/ApiService.kt

@@ -496,5 +496,24 @@ class ApiService {
 
         })
     }
+
+      fun updateStore(requestParams: HashMap<String, String?>) {
+      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?>?) {
+
+          }
+
+          override fun onFailer(result: HttpResult<Any?>?) {
+
+          }
+        })
+    }
+
   }
 }

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

@@ -146,4 +146,11 @@ 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?>>
 }

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

@@ -2,9 +2,12 @@ package com.yidian.shenghuoquan.newscontent.ui
 
 import android.content.Intent
 import android.os.Bundle
-import android.widget.Toast
+import com.orhanobut.hawk.Hawk
+import com.yidian.common.HawkConfig
 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 +16,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)
   }
@@ -30,7 +35,16 @@ class EditStoreActivity : BaseActivity<ActivityStoreEditBinding>(), CommonTopBar
   }
 
   override fun onDoAction() {
-    Toast.makeText(this@EditStoreActivity, "save", Toast.LENGTH_SHORT).show()
+    val requestParams = HashMap<String, String?>()
+    requestParams["sub_shop_id"] = ""
+    requestParams["life_account_id"] = StorageUtil.getLifeAccountId()
+    requestParams["phone"] = viewBind.storePhoneNum.text.toString()
+    requestParams["shop_id"] = ""
+    requestParams["shop_name"] = Hawk.get(HawkConfig.UmToken)
+    requestParams["latitude"] = store.latitude
+    requestParams["longitude"] = store.longitude
+    requestParams["address"] = store.title
+    ApiService.updateStore(requestParams)
   }
 
 
@@ -38,17 +52,13 @@ 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)
 }

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

@@ -56,7 +56,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/res/layout/activity_store_edit.xml

@@ -36,15 +36,19 @@
                 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:background="@null"
+                android:textStyle="bold"
                 android:text="一点资讯生活号"
-                android:textColor="#FF333333"
-                android:textSize="16sp"
-                android:textStyle="bold" />
+                android:maxLength="13"
+                android:textColor="#333333"
+                android:textSize="16sp" />
+
         </LinearLayout>
 
 
@@ -115,15 +119,19 @@
                 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:text="18519288888"
+                android:inputType="number"
+                android:maxLength="13"
+                android:textColor="#333333"
+                android:textSize="16sp" />
+
         </LinearLayout>
 
         <LinearLayout