Merge branch 'dev_commodity' of...

Merge branch 'dev_commodity' of https://git.yidian-inc.com:8021/bp/ShenghuoquanBusiness into dev_commodity

CommonLib/Common/build.gradle

@@ -22,6 +22,7 @@ android {
         buildConfigField("boolean", "IS_ENCRYPT", rootProject.ext.android.isEncrypt)
         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)
 
         manifestPlaceholders = [qqappid: "101923771"]
 

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

@@ -219,9 +219,9 @@ open class YdBaseApplication : Application() {
    */
   private fun initAppUpgrade() {
     val logger = XLogger("appUpgrade")
-    logger.debugOn(true)
+    logger.debugOn(BuildConfig.DEBUG)
     YDAppUpdateManager.init(PmUpdateApp(this) {
-      online = false // 线上true、线下false
+      online = BuildConfig.IS_APP_UPGRADE_ONLINE // 线上true、线下false
       platformId = AppConfig.TowerProPlatformId // 平台Id
       platform = AppConfig.TowerProPlatform // ios/Android
       appId = packageName // 应用包名

CommonLib/Common/src/main/java/com/yidian/common/services/ImageService.kt

@@ -26,11 +26,13 @@ import java.io.FileInputStream
  * description: 图片服务
  * 提供调用原生相机拍照、图片选择器、图片预览、图片上传能力
  */
+// TODO: 7/9/21 动态获取权限
+// TODO: 7/9/21 清除缓存
 class ImageService : ZapService() {
 
   companion object {
     private const val TAG = "ImageService"
-    const val SERVICE_NAME = "ImageService"
+    const val SERVICE_NAME = "imageService"
 
     // 选择图片
     const val ACTION_SELECT_PIC = "selectImage"
@@ -108,7 +110,10 @@ class ImageService : ZapService() {
     PictureSelector.create(curTopActivity)
       .openGallery(PictureMimeType.ofImage())
       .imageEngine(GlideEngine.createGlideEngine())
-      .maxSelectNum(SELECT_PIC_MAX_COUNT - params.maxCount)
+      .maxSelectNum(params.maxCount)
+      .isWeChatStyle(true)
+      .isCompress(true)
+      .compressQuality(10)
       .forResult(object : OnResultCallbackListener<LocalMedia> {
         override fun onResult(result: MutableList<LocalMedia>?) {
           if (result.isNullOrEmpty()) {
@@ -116,12 +121,12 @@ class ImageService : ZapService() {
             return
           }
           cacheSelectedImages.addAll(result as ArrayList<LocalMedia>)
-          val picList = ArrayList<SelectedImageBean>(SELECT_PIC_MAX_COUNT - params.maxCount)
+          val picList = ArrayList<SelectedImageBean>(params.maxCount)
           result.forEach {
             picList.add(
               SelectedImageBean(
                 result[0].id.toString(),
-                Base64.encodeToString(FileInputStream(it.realPath).readBytes(), Base64.DEFAULT)
+                Base64.encodeToString(FileInputStream(it.compressPath).readBytes(), Base64.DEFAULT)
               )
             )
           }
@@ -134,6 +139,8 @@ class ImageService : ZapService() {
         }
 
       })
+//    ToastUtils.showShort("请到设置中授予存储空间权限")
+//    resolver.fail(CODE_PERMISSION_GRANT_FAIL, "check permission READ_EXTERNAL_STORAGE failed", "获取读取外部存储权限失败")
   }
 
   /**
@@ -143,6 +150,8 @@ class ImageService : ZapService() {
     PictureSelector.create(curTopActivity)
       .openCamera(PictureMimeType.ofImage())
       .imageEngine(GlideEngine.createGlideEngine())
+      .isCompress(true)
+      .compressQuality(10)
       .forResult(object : OnResultCallbackListener<LocalMedia> {
         override fun onResult(result: MutableList<LocalMedia>?) {
           if (result.isNullOrEmpty()) {
@@ -157,7 +166,7 @@ class ImageService : ZapService() {
                 arrayListOf(
                   SelectedImageBean(
                     result[0].id.toString(),
-                    Base64.encodeToString(FileInputStream(result[0].realPath).readBytes(), Base64.DEFAULT)
+                    Base64.encodeToString(FileInputStream(result[0].compressPath).readBytes(), Base64.DEFAULT)
                   )
                 )
               )
@@ -169,6 +178,8 @@ class ImageService : ZapService() {
           resolver.fail(CODE_ACTION_CANCEL, "take cancel", "拍照取消")
         }
       })
+//    ToastUtils.showShort("请到设置中授予相机权限")
+//    resolver.fail(CODE_PERMISSION_GRANT_FAIL, "check permission CAMERA failed", "获取摄像头权限失败")
   }
 
   /**

Components/commodity/src/main/java/com/yidian/shenghuoquan/commodity/ui/coupon/CommodityManagementActivity.kt

@@ -54,7 +54,7 @@ class CommodityManagementActivity : BaseMvvmActivity<CommodityActivityCommodityM
     //发布商品
     binding.tvCommodityPublish.setOnClickListener {
       // 跳转商品发布页面 新发布商品不传id
-      XPageManager.push(XRouterPathConstants.PUBLISH_COUPONS_ACTIVITY, hashMapOf(Pair(EXTRA_COMMODITY_ID, "")))
+      XPageManager.push(XRouterPathConstants.PUBLISH_COUPONS_ACTIVITY, null)
     }
   }
 

config/config.gradle

@@ -6,9 +6,10 @@ ext {
             versionName       : "1.0.0",
             serviceVersion    : '"000100"', // 上线前需要和服务端确认并更新
             isEncrypt         : 'false',    // 上线时改成true开启加密
-            isEncryptDebugKey: 'true',     // 上线前需要使用正式加密key 置为false
+            isEncryptDebugKey : 'true',     // 上线前需要使用正式加密key 置为false
             isUmengRelease    : 'false',    // 上线时改成true，使用上线版本的友盟配置
-            isApplication    : false
+            isApplication     : false,
+            isAppUpgradeOnline: 'true' // 上线前需要开启版本升级线上环境 true
     ]
     buildParams = [
             debug  : [