Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/ModulePedometer

# Conflicts: # config.gradle

Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/ModulePedometer
# Conflicts: # config.gradle
YangShuai
2 parents d519e4b7 bb4ed54e
Showing 2 changed files with 3 additions and 2 deletions
config.gradle
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/ShareRecordActivity.java
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "1.0.2",
+            version: "1.0.4",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -20,6 +20,7 @@ import com.alibaba.android.arouter.launcher.ARouter;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.resource.bitmap.CircleCrop;
 import com.bumptech.glide.request.RequestOptions;
+import com.cnlive.libs.base.application.AppConfig;
 import com.cnlive.libs.base.arouter.QrService;
 import com.cnlive.libs.base.util.SimpleDES;
 import com.cnlive.libs.base.util.StatusBarUtil;
@@ -136,7 +137,7 @@ public class ShareRecordActivity extends AppCompatActivity {
             String qrContent = jsonObject.toString();
             String encryptionContent = SimpleDES.ebotongEncrypto(qrContent, "cnliveIm");
             encryptionContent = encryptionContent.replaceAll("\\\n", "");
-            String url = "http://apiwjj.cnlive.com/download/index.html" + "?isWjjQr=" + encryptionContent + "&type=wjjQrSportEventType";
+            String url = AppConfig.getShareDownload() + "isWjjQr=" + encryptionContent + "&wjjQrSkipType=wjjQrSportEventType";
             Bitmap bitmap = service.createQRNoIconBitmap(url, 350);
             ((ImageView) findViewById(R.id.down_img)).setImageBitmap(bitmap);
         }catch (Exception e){