Commit 5477d28013db5ab51db3411bb4bcbc707e42b587

Authored by 韩亚云
1 parent 31e354a0

代码合并3

config.gradle
@@ -21,7 +21,7 @@ ext { @@ -21,7 +21,7 @@ ext {
21 //编译方式 21 //编译方式
22 debug : false, 22 debug : false,
23 //版本号 23 //版本号
24 - version: "0.7.27", 24 + version: "0.7.28",
25 //Lib库前缀 25 //Lib库前缀
26 packeg : "com.cnlive.module", 26 packeg : "com.cnlive.module",
27 //Lib库名称 27 //Lib库名称
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/ShareRecordActivity.java
@@ -133,7 +133,7 @@ public class ShareRecordActivity extends AppCompatActivity { @@ -133,7 +133,7 @@ public class ShareRecordActivity extends AppCompatActivity {
133 String qrContent = jsonObject.toString(); 133 String qrContent = jsonObject.toString();
134 String encryptionContent = SimpleDES.ebotongEncrypto(qrContent, "cnliveIm"); 134 String encryptionContent = SimpleDES.ebotongEncrypto(qrContent, "cnliveIm");
135 encryptionContent = encryptionContent.replaceAll("\\\n", ""); 135 encryptionContent = encryptionContent.replaceAll("\\\n", "");
136 - String url = "http://apiwjj.cnlive.com/download/index.html" + "&isWjjQr=" + encryptionContent; 136 + String url = "http://apiwjj.cnlive.com/download/index.html" + "?isWjjQr=" + encryptionContent;
137 Bitmap bitmap = service.createQRNoIconBitmap(url, 350); 137 Bitmap bitmap = service.createQRNoIconBitmap(url, 350);
138 ((ImageView) findViewById(R.id.down_img)).setImageBitmap(bitmap); 138 ((ImageView) findViewById(R.id.down_img)).setImageBitmap(bitmap);
139 }catch (Exception e){ 139 }catch (Exception e){