Compare commits

...

10 Commits

@ -15,8 +15,25 @@ android {
resValue "string", "authorities", applicationId resValue "string", "authorities", applicationId
resourceConfigurations += ['zh', 'en', 'hdpi'] resourceConfigurations += ['zh', 'en', 'hdpi']
} }
buildFeatures {
buildConfig = true
}
signingConfigs {
release {
keyAlias 'key0'
storeFile file('../key/keystore1')
storePassword 'abc123123'
keyPassword 'abc123123'
v1SigningEnabled true //V1
v2SigningEnabled true //V2
}
}
/* keypassword:abc123123 alias key0*/ /* keypassword:abc123123 alias key0*/
buildTypes { buildTypes {
debug {
minifyEnabled false
buildConfigField "boolean", "LOG_ERROR", "true"
}
release { release {
lintOptions { lintOptions {
checkReleaseBuilds false checkReleaseBuilds false
@ -26,6 +43,8 @@ android {
zipAlignEnabled true // zip zipAlignEnabled true // zip
debuggable false // debug debuggable false // debug
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
buildConfigField "boolean", "LOG_ERROR", "false"
signingConfig signingConfigs.release //
} }
} }
sourceSets { sourceSets {

@ -23,8 +23,10 @@
<uses-permission android:name="android.permission.CAMERA" /> <uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> tools:ignore="ScopedStorage" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
tools:ignore="ScopedStorage" />
<uses-permission android:name="android.permission.READ_PROFILE" /> <uses-permission android:name="android.permission.READ_PROFILE" />
<uses-permission android:name="android.permission.READ_CONTACTS" /> <uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-permission android:name="android.permission.NFC" /> <uses-permission android:name="android.permission.NFC" />
@ -53,6 +55,10 @@
<uses-feature <uses-feature
android:name="android.hardware.nfc" android:name="android.hardware.nfc"
android:required="true" /> android:required="true" />
<uses-feature
android:name="android.hardware.telephony"
android:required="false" />
<permission-group android:name="${applicationId}.andpermission"/> <permission-group android:name="${applicationId}.andpermission"/>

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

@ -536,13 +536,21 @@ public class ScxsjhFragment extends BaseFragment {
MeasureDialog measureDialog = new MeasureDialog(context, "你确定要删除?", new MeasureDialog.AuditDialogListener() { MeasureDialog measureDialog = new MeasureDialog(context, "你确定要删除?", new MeasureDialog.AuditDialogListener() {
@Override @Override
public void confirm() { public void confirm() {
for (int i = 0; i < dbxjjh.size(); i++) { dbxjjh.removeIf((item) -> {
if (dbxjjh.get(i).isChecked()) { if (item.isChecked()) {
DataSupport.deleteAll(XSJJHXZDataBean.class, "zxid = ? and username = ?", dbxjjh.get(i).getZxid(), username); DataSupport.deleteAll(XSJJHXZDataBean.class, "zxid = ? and username = ?", item.getZxid(), username);
DataSupport.deleteAll(XSJJHDataBean.class, "zxid = ? and username = ?", dbxjjh.get(i).getZxid(), username); DataSupport.deleteAll(XSJJHDataBean.class, "zxid = ? and username = ?", item.getZxid(), username);
DataSupport.deleteAll(Xjjh.class, "zxid = ? and username = ?", dbxjjh.get(i).getZxid(), username); DataSupport.deleteAll(Xjjh.class, "zxid = ? and username = ?", item.getZxid(), username);
} }
} return item.isChecked();
});
// for (int i = 0; i < dbxjjh.size(); i++) {
// if (dbxjjh.get(i).isChecked()) {
// DataSupport.deleteAll(XSJJHXZDataBean.class, "zxid = ? and username = ?", dbxjjh.get(i).getZxid(), username);
// DataSupport.deleteAll(XSJJHDataBean.class, "zxid = ? and username = ?", dbxjjh.get(i).getZxid(), username);
// DataSupport.deleteAll(Xjjh.class, "zxid = ? and username = ?", dbxjjh.get(i).getZxid(), username);
// }
// }
//刷新页面 //刷新页面
initData(); initData();

Before

Width:  |  Height:  |  Size: 709 B

After

Width:  |  Height:  |  Size: 709 B

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Before

Width:  |  Height:  |  Size: 897 B

After

Width:  |  Height:  |  Size: 897 B

Before

Width:  |  Height:  |  Size: 758 B

After

Width:  |  Height:  |  Size: 758 B

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save