CNLive Android Team / ModulePedometer · Commits

Commit 85acdb87717d444213dfc96a21181bb2fe14eccf

Authored by 杨帅
2 parents a4ea768e 5ff829c6

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	config.gradle
Inline Side-by-side
Showing 2 changed files with 7 additions and 3 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RaceRecorView.java
  View file @85acdb8
... ... @@ -111,7 +111,7 @@ public class RaceRecorView implements MvpView {
111 111 .setOnClickListener(v -> {
112 112 //分享
113 113 ShareRecordActivity.newInstance(fragment.getActivity(), fragment.raceTitle, bestResultBean.getMileage(), bestResultBean.getStep(),
114   - bestResultBean.getEmployTime(), bestResultBean.getPace());
  114 + bestResultBean.getEmployTime(), bestResultBean.getPace(),bestResultBean.getRecordId()+"");
115 115 });
116 116  
117 117 } else {
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/ShareRecordActivity.java
  View file @85acdb8
... ... @@ -51,14 +51,16 @@ public class ShareRecordActivity extends AppCompatActivity {
51 51 private PermissionsUtils mPermissionsUtils = new PermissionsUtils();
52 52 private ImageView record_icon;
53 53 private TextView record_name;
  54 + private String idName;
54 55  
55   - public static void newInstance(Activity context, String title, String kilo, String step, String time, String speed) {
  56 + public static void newInstance(Activity context, String title, String kilo, String step, String time, String speed,String idName) {
56 57 Intent intent = new Intent(context, ShareRecordActivity.class);
57 58 intent.putExtra("raceTitle", title);
58 59 intent.putExtra("kilo", kilo);
59 60 intent.putExtra("step", step);
60 61 intent.putExtra("time", time);
61 62 intent.putExtra("speed", speed);
  63 + intent.putExtra("idName",idName);
62 64 context.startActivity(intent);
63 65 }
64 66  
... ... @@ -69,6 +71,7 @@ public class ShareRecordActivity extends AppCompatActivity {
69 71 StatusBarUtil2.setColor(this, getResources().getColor(R.color.bg), 0);
70 72 setContentView(R.layout.activity_share_record);
71 73  
  74 + if(getIntent().getStringExtra("idName") != null) idName = getIntent().getStringExtra("idName");
72 75 cord_name = findViewById(R.id.cord_name);
73 76 cord_name.setText("我在中国网家家\n" + getIntent().getStringExtra("raceTitle") + "中的最佳成绩");
74 77 ((TextView) findViewById(R.id.kilo_share)).setText(getIntent().getStringExtra("kilo"));
... ... @@ -133,7 +136,7 @@ public class ShareRecordActivity extends AppCompatActivity {
133 136 String qrContent = jsonObject.toString();
134 137 String encryptionContent = SimpleDES.ebotongEncrypto(qrContent, "cnliveIm");
135 138 encryptionContent = encryptionContent.replaceAll("\\\n", "");
136   - String url = "http://apiwjj.cnlive.com/download/index.html" + "&isDZTVQr=" + encryptionContent;
  139 + String url = "http://apiwjj.cnlive.com/download/index.html" + "?isWjjQr=" + encryptionContent;
137 140 Bitmap bitmap = service.createQRNoIconBitmap(url, 350);
138 141 ((ImageView) findViewById(R.id.down_img)).setImageBitmap(bitmap);
139 142 }catch (Exception e){
... ... @@ -151,6 +154,7 @@ public class ShareRecordActivity extends AppCompatActivity {
151 154 editText.setCursorVisible(true);
152 155 ARouter.getInstance().build("/share/ShareImgActivity")
153 156 .withString("bitmap", "share_img_string")
  157 + .withString("fileName",idName)
154 158 .navigation(this);
155 159 }
156 160  
... ...