CNLive Android Team / ModulePedometer · Commits

Commit fa3eff061e4c133a7faf5c3aab3781d8c8859638

Authored by YangShuai
2 parents d519e4b7 bb4ed54e

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

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