Skip to content

Commit e69c52b

Browse files
xmJasminedanielsocials
xmJasmine
authored and
danielsocials
committed
save Qrcode
1 parent 561d035 commit e69c52b

20 files changed

+41
-425
lines changed

‎android/app/src/main/AndroidManifest.xml‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -307,11 +307,18 @@
307307
android:name=".activities.SendOne2ManyMainPageActivity"
308308
android:screenOrientation="portrait"
309309
tools:ignore="LockedOrientationActivity" />
310-
<activity android:name=".activities.TransactionDetailsActivity" />
311-
<activity android:name=".activities.ConfirmOnHardware" />
312-
<activity android:name=".activities.CreateWalletActivity" />
313-
<activity android:name=".activities.PublicKeyInputEditActivity" />
314-
<activity android:name=".activities.SelectMultiSigWalletActivity" />
310+
<activity
311+
android:name=".activities.TransactionDetailsActivity"
312+
android:screenOrientation="portrait"
313+
tools:ignore="LockedOrientationActivity" />
314+
<activity
315+
android:name=".activities.ConfirmOnHardware"
316+
android:screenOrientation="portrait"
317+
tools:ignore="LockedOrientationActivity" />
318+
<activity
319+
android:name=".activities.CreateWalletActivity"
320+
android:screenOrientation="portrait"
321+
tools:ignore="LockedOrientationActivity" />
315322
<activity
316323
android:name=".activities.WalletUnActivatedActivity"
317324
android:label=""

‎android/app/src/main/java/org/haobtc/wallet/activities/PublicKeyInputEditActivity.java‎

Lines changed: 0 additions & 132 deletions
This file was deleted.

‎android/app/src/main/java/org/haobtc/wallet/activities/SelectMultiSigWalletActivity.java‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎android/app/src/main/java/org/haobtc/wallet/activities/ShareOtherActivity.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import android.graphics.Color;
1111
import android.graphics.drawable.BitmapDrawable;
1212
import android.graphics.drawable.ColorDrawable;
13+
import android.net.Uri;
1314
import android.os.Environment;
1415
import android.text.TextUtils;
1516
import android.util.Log;
@@ -120,7 +121,7 @@ public void initData() {
120121
tetTrsactionText.setText(rowTx);
121122
}
122123

123-
public int dp2px(float dpValue) {
124+
public int dp2px(float dpValue) {
124125
final float scale = getResources().getDisplayMetrics().density;
125126
return (int) (dpValue * scale + 0.5f);
126127
}
@@ -133,7 +134,7 @@ public int dp2px(float dpValue) {
133134
HINTS.put(EncodeHintType.MARGIN, 0);
134135
}
135136

136-
public Bitmap syncEncodeQRCode(String content, int size, int foregroundColor, int backgroundColor, Bitmap logo) {
137+
public Bitmap syncEncodeQRCode(String content, int size, int foregroundColor, int backgroundColor, Bitmap logo) {
137138
try {
138139
BitMatrix matrix = new MultiFormatWriter().encode(content, BarcodeFormat.QR_CODE, size, size, HINTS);
139140
int[] pixels = new int[size * size];
@@ -237,6 +238,7 @@ public boolean saveBitmap(Bitmap bitmap) {
237238
boolean success = bitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos);
238239
fos.flush();
239240
fos.close();
241+
sendBroadcast(new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, Uri.parse("file://" + filePic.getAbsolutePath())));
240242
return success;
241243

242244
} catch (IOException ignored) {

‎android/app/src/main/java/org/haobtc/wallet/activities/jointwallet/MultiSigWalletCreator.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import android.content.Intent;
1010
import android.content.SharedPreferences;
1111
import android.graphics.Bitmap;
12+
import android.net.Uri;
1213
import android.os.Bundle;
1314
import android.os.Environment;
1415
import android.os.Handler;
@@ -360,6 +361,7 @@ public boolean saveBitmap(Bitmap bitmap) {
360361
boolean success = bitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos);
361362
fos.flush();
362363
fos.close();
364+
sendBroadcast(new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, Uri.parse("file://" + filePic.getAbsolutePath())));
363365
return success;
364366

365367
} catch (IOException ignored) {
@@ -848,7 +850,7 @@ public void handleMessage(@NonNull Message msg) {
848850
cardViewThree.setVisibility(View.VISIBLE);
849851
relFinish.setVisibility(View.VISIBLE);
850852
cardThreePublic.setVisibility(View.VISIBLE);
851-
tetWhoWallet.setText(String.format("%s （%s/%s）", strWalletname, strInditor1, strInditor2));
853+
tetWhoWallet.setText(String.format("%s （%s/%s）", strWalletname, strInditor2, strInditor1));
852854
tetManyKey.setText(String.format("%s%s%s", getString(R.string.is_use), strInditor1, getString(R.string.the_only_bixinkey)));
853855
}
854856
}

‎android/app/src/main/java/org/haobtc/wallet/activities/personalwallet/AppWalletCreateFinishActivity.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import android.Manifest;
44
import android.content.Intent;
55
import android.graphics.Bitmap;
6+
import android.net.Uri;
67
import android.os.Environment;
78
import android.util.Log;
89
import android.view.View;
@@ -138,6 +139,7 @@ public boolean saveBitmap(Bitmap bitmap) {
138139
boolean success = bitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos);
139140
fos.flush();
140141
fos.close();
142+
sendBroadcast(new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, Uri.parse("file://" + filePic.getAbsolutePath())));
141143
return success;
142144

143145
} catch (IOException ignored) {

‎android/app/src/main/java/org/haobtc/wallet/activities/personalwallet/CreatFinishPersonalActivity.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import android.graphics.Bitmap;
66
import android.graphics.Color;
77
import android.graphics.drawable.ColorDrawable;
8+
import android.net.Uri;
89
import android.os.Environment;
910
import android.util.Log;
1011
import android.view.Display;
@@ -196,6 +197,7 @@ public boolean saveBitmap(Bitmap bitmap) {
196197
boolean success = bitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos);
197198
fos.flush();
198199
fos.close();
200+
sendBroadcast(new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, Uri.parse("file://" + filePic.getAbsolutePath())));
199201
return success;
200202

201203
} catch (IOException ignored) {

‎android/app/src/main/java/org/haobtc/wallet/activities/personalwallet/hidewallet/CheckHideWalletActivity.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -305,13 +305,13 @@ public void onItemChildClick(BaseQuickAdapter adapter, View view, int position)
305305
}
306306

307307
@SingleClick
308-
@OnClick({R.id.img_back, R.id.wallet_card_bn1, R.id.wallet_card_bn2, R.id.wallet_card_bn3, R.id.conlay_back, R.id.textView_more})
308+
@OnClick({R.id.img_back, R.id.linear_send, R.id.linear_receive, R.id.linear_sign, R.id.conlay_back, R.id.textView_more})
309309
public void onViewClicked(View view) {
310310
switch (view.getId()) {
311311
case R.id.img_back:
312312
finish();
313313
break;
314-
case R.id.wallet_card_bn1:
314+
case R.id.linear_send:
315315
edit.putString("wallet_type_to_sign", "1-1");
316316
edit.apply();
317317
Intent intent1 = new Intent(CheckHideWalletActivity.this, SendOne2OneMainPageActivity.class);
@@ -322,12 +322,12 @@ public void onViewClicked(View view) {
322322
intent1.putExtra("hideRefresh", "hideRefresh");
323323
startActivity(intent1);
324324
break;
325-
case R.id.wallet_card_bn2:
325+
case R.id.linear_receive:
326326
Intent intent2 = new Intent(CheckHideWalletActivity.this, ReceivedPageActivity.class);
327327
intent2.putExtra("hideWalletReceive","hideWalletReceive");
328328
startActivity(intent2);
329329
break;
330-
case R.id.wallet_card_bn3:
330+
case R.id.linear_sign:
331331
Intent intent3 = new Intent(CheckHideWalletActivity.this, SignActivity.class);
332332
intent3.putExtra("hide_phrass", "hideWallet");
333333
intent3.putExtra("personceType", "1-1");

‎android/app/src/main/java/org/haobtc/wallet/activities/personalwallet/mnemonic_word/CreateHelpWordWalletActivity.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ public void initData() {
6464
private void setEditTextComments() {
6565
walletNameNum = defaultName + 1;
6666
editWalletNameSetting.setText(String.format("钱包%s", String.valueOf(walletNameNum)));
67+
tetTextNum.setText(String.format(Locale.CHINA, "%d/16", editWalletNameSetting.length()));
6768
editWalletNameSetting.addTextChangedListener(new TextWatcher() {
6869
CharSequence input;
6970

‎android/app/src/main/java/org/haobtc/wallet/activities/personalwallet/mnemonic_word/CreateInputHelpWordWalletSuccseActivity.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package org.haobtc.wallet.activities.personalwallet.mnemonic_word;
22

33
import android.Manifest;
4+
import android.content.Intent;
45
import android.graphics.Bitmap;
6+
import android.net.Uri;
57
import android.os.Environment;
68
import android.util.Log;
79
import android.view.View;
@@ -139,6 +141,7 @@ public boolean saveBitmap(Bitmap bitmap) {
139141
boolean success = bitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos);
140142
fos.flush();
141143
fos.close();
144+
sendBroadcast(new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, Uri.parse("file://" + filePic.getAbsolutePath())));
142145
return success;
143146

144147
} catch (IOException ignored) {

0 commit comments

Comments
 (0)