Merge branch 'dev_commodity' into dev_structure

# Conflicts:
#	Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/center/MerchantCenterActivity.kt

CommonLib/Common/build.gradle

@@ -23,6 +23,7 @@ android {
         buildConfigField("boolean", "IS_UMENG_RELEASE", rootProject.ext.android.isUmengRelease)
         buildConfigField("boolean", "IS_ENCRYPT_DEBUG_KEY", rootProject.ext.android.isEncryptDebugKey)
         buildConfigField("boolean", "IS_APP_UPGRADE_ONLINE", rootProject.ext.android.isAppUpgradeOnline)
+        buildConfigField("String", "TOWER_API_ENV", rootProject.ext.android.towerApiEnv)
 
         manifestPlaceholders = [qqappid: "101923771"]
 

CommonLib/Common/src/main/java/com/yidian/common/AppConfig.kt

@@ -29,6 +29,14 @@ class AppConfig {
     const val TowerProPlatformId = 29
     const val TowerProPlatform = "Android"
 
+    // TowerPro 通用配置模块
+    const val TowerApiEnvTest = "0" // 测试环境
+    const val TowerApiEnvPro = "2" // 外网-正式环境
+    const val TowerApiEnv = BuildConfig.TOWER_API_ENV
+    const val TowerApiOS = "2" // 0:ios 1:安卓 2:全部
+    const val TowerApiKeyTag = "function-config"
+    const val TowerApiVersion = "1.0.0"
+
     // 分享相关的三方平台配置
     const val WeChatAppKey = "wxef4c37f254e29e84"
     const val WeChatAppSecret = "fb596ed3641b481b6f973774987fd04f"

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

 package com.yidian.common.http
 
 import com.google.gson.reflect.TypeToken
+import com.yidian.common.AppConfig
+import com.yidian.common.BuildConfig
 import com.yidian.common.YdBaseApplication
+import com.yidian.common.http.bean.GetCommonConfigBean
 import com.yidian.common.http.bean.GetKSYunObjectIdBean
 import com.yidian.common.http.bean.GetKSYunTokenBean
+import com.yidian.common.http.callback.IGetCommonConfigCallback
 import com.yidian.common.http.callback.IGetKSYunObjectIdCallback
 import com.yidian.http.ServiceFactory
 import com.yidian.utils.ToastUtil
@@ -15,6 +19,19 @@ import com.yidian.utils.ToastUtil
  */
 object CommonDataSource {
 
+  // Tower-Api 域名
+  private val domainTowerApi by lazy {
+    if (BuildConfig.TOWER_API_ENV == AppConfig.TowerApiEnvTest) {
+      CommonService.DOMAIN_TOWER_API_TEST
+    } else {
+      CommonService.DOMAIN_TOWER_API_PRO
+    }
+  }
+
+  private val towerApi by lazy {
+    ServiceFactory.getInstance().createService(CommonService::class.java, domainTowerApi)
+  }
+
   // 301 获取金山云token接口
   fun getKSYunToken(requestParams: HashMap<String, String?>): HttpResult<GetKSYunTokenBean.Response>? {
     val timeStamp = System.currentTimeMillis()
@@ -53,4 +70,20 @@ object CommonDataSource {
         }
       })
   }
+
+  // TowerPro 获取配置数据
+  fun getCommonConfig(apiCallback: IGetCommonConfigCallback, requestParams: HashMap<String, String>) {
+    towerApi
+      .getCommonConfig(requestParams)
+      .compose(TransformUtil.defaultSchedulers())
+      .subscribe(object : HttpResultObserver<GetCommonConfigBean.GetCommonConfigResponse>() {
+        override fun onSuccess(result: HttpResult<GetCommonConfigBean.GetCommonConfigResponse>?) {
+          apiCallback.getCommonConfigSuccess(result?.result)
+        }
+
+        override fun onFailure(result: HttpResult<GetCommonConfigBean.GetCommonConfigResponse>?) {
+          apiCallback.getCommonConfigFailure(result?.status)
+        }
+      })
+  }
 }

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

 package com.yidian.common.http
 
+import com.yidian.common.http.bean.GetCommonConfigBean
 import io.reactivex.rxjava3.core.Observable
 import retrofit2.Call
 import retrofit2.http.*
@@ -11,6 +12,15 @@ import retrofit2.http.*
  */
 interface CommonService {
 
+  companion object {
+    // Tower Api域名定义
+    const val DOMAIN_TOWER_API_TEST = "http://open-tower-api.test.int.yidian-inc.com:8222"
+    const val DOMAIN_TOWER_API_PRO = "https://open-tower-api.go2yd.com"
+
+    // tower-api 获取配置数据
+    private const val getCommonConfig = "/api/resource"
+  }
+
   @Headers("Content-Type: application/json")
   @POST(URLs.getKSYunToken)
   fun getKSYunToken(@QueryMap commonParams: Map<String, String>, @Body requestParams: Map<String, String?>): Call<HttpResult<Any?>>
@@ -20,4 +30,7 @@ interface CommonService {
     @QueryMap commonParams: Map<String, String>,
     @QueryMap requestParams: Map<String, String?>
   ): Observable<HttpResult<Any?>>
+
+  @GET(getCommonConfig)
+  fun getCommonConfig(@QueryMap requestParams: Map<String, String>): Observable<HttpResult<GetCommonConfigBean.GetCommonConfigResponse>>
 }

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

+package com.yidian.common.http
+
+import com.google.gson.JsonParseException
+import com.yidian.common.YdBaseApplication
+import com.yidian.utils.ToastUtil
+import io.reactivex.rxjava3.core.Observer
+import io.reactivex.rxjava3.disposables.Disposable
+
+/**
+ * author: yinjiacheng
+ * date: 7/13/21 9:00 AM
+ * description: 网路请求解析
+ * 非商户后台使用
+ */
+abstract class HttpResultObserver<T> : Observer<HttpResult<T>> {
+  private var isShowErrorMsg = true
+
+  override fun onSubscribe(d: Disposable) { //网络请求之前
+
+  }
+
+  override fun onComplete() { //网络请求完成
+
+  }
+
+  override fun onError(e: Throwable) {
+    if (e.toString().contains("ConnectException") || e.toString().contains("Unable to resolve host")) {
+      if (isShowErrorMsg) {
+        ToastUtil.showToast(YdBaseApplication.context, "当前网络链接不畅，请检查您的网络情况")
+      }
+    } else if ("connect timed out" == e.message) {
+      if (isShowErrorMsg) {
+        ToastUtil.showToast(YdBaseApplication.context, "服务器连接超时")
+      }
+    } else if (e is JsonParseException || e.toString().contains("Json") || e.toString().contains("Gson")) {
+      if (isShowErrorMsg) {
+        ToastUtil.showToast(YdBaseApplication.context, "数据解析异常")
+      }
+    } else {
+      if (isShowErrorMsg) {
+        ToastUtil.showToast(YdBaseApplication.context, "网络请求异常")
+      }
+    }
+    onRequestFailure(Exception(e.toString()))
+  }
+
+  override fun onNext(result: HttpResult<T>) {
+    if (result.code == 0) {
+      onRequestSuccess(result)
+    } else {
+      onFailure(result)
+      ToastUtil.showToast(YdBaseApplication.context, result.reason)
+    }
+  }
+
+  abstract fun onSuccess(result: HttpResult<T>?)
+  abstract fun onFailure(result: HttpResult<T>?)
+
+  private fun onRequestFailure(e: Throwable?) {
+    val result: HttpResult<T> = HttpResult()
+    result.code = -100
+    result.reason = e?.message
+    result.status = "failed"
+    onFailure(result)
+  }
+
+  private fun onRequestSuccess(result: HttpResult<T>) {
+    onSuccess(result)
+  }
+}

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

+package com.yidian.common.http.bean
+
+import com.google.gson.annotations.SerializedName
+
+/**
+ * author: yinjiacheng
+ * date: 7/12/21 10:10 PM
+ * description: open-tower-api.go2yd.com/api/resource
+ */
+class GetCommonConfigBean {
+
+  data class GetCommonConfigResponse(
+    @SerializedName("appid")
+    val appid: String,
+    @SerializedName("created_at")
+    val createdAt: String,
+    @SerializedName("creator")
+    val creator: String,
+    @SerializedName("data")
+    val `data`: Data,
+    @SerializedName("env")
+    val env: Int,
+    @SerializedName("_id")
+    val id: String,
+    @SerializedName("keyTag")
+    val keyTag: String,
+    @SerializedName("note")
+    val note: String,
+    @SerializedName("os")
+    val os: Int,
+    @SerializedName("status")
+    val status: String,
+    @SerializedName("uniqueKey")
+    val uniqueKey: String,
+    @SerializedName("updated_at")
+    val updatedAt: String,
+    @SerializedName("version")
+    val version: String
+  )
+
+  data class Data(
+    @SerializedName("is_show_app_upgrade")
+    val isShowAppUpgrade: Int,
+    @SerializedName("merchant_manager_center")
+    val merchantManagerCenter: MerchantManagerCenter
+  )
+
+  data class MerchantManagerCenter(
+    @SerializedName("disable_text")
+    val disableText: String,
+    @SerializedName("disable_url")
+    val disableUrl: Any,
+    @SerializedName("items")
+    val items: List<Item>,
+    @SerializedName("show")
+    val show: Int
+  )
+
+  data class Item(
+    @SerializedName("functions")
+    val functions: List<Function>,
+    @SerializedName("group_id")
+    val groupId: Int,
+    @SerializedName("group_name")
+    val groupName: String,
+    @SerializedName("show")
+    val show: Int
+  )
+
+  data class Function(
+    @SerializedName("function_id")
+    val functionId: Int,
+    @SerializedName("function_name")
+    val functionName: String,
+    @SerializedName("icon_url")
+    val iconUrl: String,
+    @SerializedName("link_url")
+    val linkUrl: Any,
+    @SerializedName("show")
+    val show: Int
+  )
+
+}

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

+package com.yidian.common.http.callback
+
+import com.yidian.common.http.bean.GetCommonConfigBean
+
+/**
+ * author: yinjiacheng
+ * date: 7/12/21 10:24 PM
+ * description: open-tower-api.go2yd.com/api/resource
+ */
+interface IGetCommonConfigCallback {
+  fun getCommonConfigSuccess(result: GetCommonConfigBean.GetCommonConfigResponse?)
+  fun getCommonConfigFailure(message: String?)
+}

Components/commodity/src/main/java/com/yidian/shenghuoquan/commodity/dto/CommodityManagementListDto.kt

@@ -33,7 +33,7 @@ data class Goods(
   @SerializedName("goods_spu_id")
   val goodsSpuId: String,
   @SerializedName("inventory_rest")
-  val inventoryRest: Int,
+  val inventoryRest: Long,
   @SerializedName("online_status")
   val onlineStatus: Int,
   @SerializedName("original_price")
@@ -41,7 +41,7 @@ data class Goods(
   @SerializedName("price")
   val price: Double,
   @SerializedName("total_amount_sold")
-  val totalAmountSold: Int
+  val totalAmountSold: Long
 )
 
 data class Status(

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

@@ -6,8 +6,8 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
+import com.yidian.common.http.bean.GetCommonConfigBean
 import com.yidian.shenghuoquan.newscontent.databinding.ItemMerchantServiceFunctionBinding
-import com.yidian.shenghuoquan.newscontent.http.httpbean.GetConfigListBean
 
 /**
  * author: yinjiacheng
@@ -16,7 +16,7 @@ import com.yidian.shenghuoquan.newscontent.http.httpbean.GetConfigListBean
  */
 class MerchantServiceFunctionAdapter @JvmOverloads constructor(
   val context: Context,
-  data: List<GetConfigListBean.Function>? = null,
+  data: List<GetCommonConfigBean.Function>? = null,
   val listener: OnItemClickListener? = null
 ) :
   RecyclerView.Adapter<MerchantServiceFunctionAdapter.MerchantServiceViewHolder>() {
@@ -29,14 +29,14 @@ class MerchantServiceFunctionAdapter @JvmOverloads constructor(
   /**
    * 数据源
    */
-  private val serviceData by lazy { ArrayList<GetConfigListBean.Function>() }
+  private val serviceData by lazy { ArrayList<GetCommonConfigBean.Function>() }
 
   private lateinit var viewBinding: ItemMerchantServiceFunctionBinding
 
   init {
     // 将不显示的数据去除
     data?.let {
-      (it as ArrayList<GetConfigListBean.Function>).iterator().apply {
+      (it as ArrayList<GetCommonConfigBean.Function>).iterator().apply {
         while (hasNext()) {
           if (next().show != FUNCTION_SHOW) remove()
         }
@@ -48,10 +48,10 @@ class MerchantServiceFunctionAdapter @JvmOverloads constructor(
   /**
    * 更新数据 将不显示的数据去除
    */
-  fun updateData(data: List<GetConfigListBean.Function>?) {
+  fun updateData(data: List<GetCommonConfigBean.Function>?) {
     data?.let {
       serviceData.clear()
-      (it as ArrayList<GetConfigListBean.Function>).iterator().apply {
+      (it as ArrayList<GetCommonConfigBean.Function>).iterator().apply {
         while (hasNext()) {
           if (next().show != FUNCTION_SHOW) remove()
         }
@@ -72,12 +72,12 @@ class MerchantServiceFunctionAdapter @JvmOverloads constructor(
 
   override fun onBindViewHolder(holder: MerchantServiceViewHolder, position: Int) {
     val data = serviceData[position]
-    if (data.icon_url.isNotEmpty()) {
-      Glide.with(context).load(data.icon_url).into(viewBinding.ivService)
+    if (data.iconUrl.isNotEmpty()) {
+      Glide.with(context).load(data.iconUrl).into(viewBinding.ivService)
     } else {
       // TODO: 6/11/21 显示本地icon
     }
-    holder.viewBinding.tvService.text = data.function_name
+    holder.viewBinding.tvService.text = data.functionName
     holder.viewBinding.root.setOnClickListener { listener?.onItemClick(it, position, data) }
   }
 
@@ -92,7 +92,7 @@ class MerchantServiceFunctionAdapter @JvmOverloads constructor(
     RecyclerView.ViewHolder(itemView)
 
   interface OnItemClickListener {
-    fun onItemClick(view: View, position: Int, data: GetConfigListBean.Function)
+    fun onItemClick(view: View, position: Int, data: GetCommonConfigBean.Function)
   }
 
 }

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

@@ -7,8 +7,8 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.yidian.common.http.bean.GetCommonConfigBean
 import com.yidian.shenghuoquan.newscontent.databinding.ItemMerchantServiceGroupBinding
-import com.yidian.shenghuoquan.newscontent.http.httpbean.GetConfigListBean
 import com.yidian.utils.DensityUtil
 
 /**
@@ -18,7 +18,7 @@ import com.yidian.utils.DensityUtil
  */
 class MerchantServiceGroupAdapter @JvmOverloads constructor(
   val context: Context,
-  data: List<GetConfigListBean.Item>? = null,
+  data: List<GetCommonConfigBean.Item>? = null,
   val listener: MerchantServiceFunctionAdapter.OnItemClickListener? = null
 ) :
   RecyclerView.Adapter<MerchantServiceGroupAdapter.MerchantServiceGroupViewHolder>() {
@@ -34,7 +34,7 @@ class MerchantServiceGroupAdapter @JvmOverloads constructor(
    * 数据源
    */
   private val groupData by lazy {
-    ArrayList<GetConfigListBean.Item>()
+    ArrayList<GetCommonConfigBean.Item>()
   }
 
   init {
@@ -51,7 +51,7 @@ class MerchantServiceGroupAdapter @JvmOverloads constructor(
   /**
    * 刷新数据
    */
-  fun updateData(data: List<GetConfigListBean.Item>?) {
+  fun updateData(data: List<GetCommonConfigBean.Item>?) {
     groupData.clear()
     data?.let {
       it.forEach { item ->
@@ -81,7 +81,7 @@ class MerchantServiceGroupAdapter @JvmOverloads constructor(
 
   override fun onBindViewHolder(holder: MerchantServiceGroupViewHolder, position: Int) {
     val data = groupData[position]
-    holder.viewBinding.tvTitle.text = data.group_name
+    holder.viewBinding.tvTitle.text = data.groupName
     viewBinding.rvService.layoutManager = GridLayoutManager(context, 4)
     viewBinding.rvService.adapter = MerchantServiceFunctionAdapter(context, data.functions, listener)
   }

config/config.gradle

@@ -9,7 +9,8 @@ ext {
             isEncryptDebugKey : 'true',     // 上线前需要使用正式加密key 置为false
             isUmengRelease    : 'false',    // 上线时改成true，使用上线版本的友盟配置
             isApplication     : false,
-            isAppUpgradeOnline: 'true' // 上线前需要开启版本升级线上环境 true
+            isAppUpgradeOnline: 'true', // 上线前需要开启版本升级线上环境 true
+            towerApiEnv       : '"0"' //  Tower Api环境 0:测试环境 1:内网-正式环境 2:外网-正式环境 3:内网外网-正式环境
     ]
     // 高德地图的key
     amap = [