yinds 2 months ago
parent
commit
1586b66f5d

+ 1 - 1
app/build.gradle

@@ -84,7 +84,7 @@ android {
 }
 
 dependencies {
-    implementation fileTree(include: ['*.aar','*.jar'], dir: 'libs')
+      fileTree(include: ['*.aar','*.jar'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.multidex:multidex:2.0.0'
     implementation 'com.google.android.material:material:1.1.0'

+ 2 - 1
app/src/main/AndroidManifest.xml

@@ -14,7 +14,8 @@
     <!-- Required  一些系统要求的权限,如访问网络等 -->
     <uses-permission android:name="${applicationId}.permission.JPUSH_MESSAGE" />
     <!-- jpush end -->
-    <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
+    <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE"
+        tools:ignore="ProtectedPermissions" />
     <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

+ 16 - 4
app/src/main/java/com/hw/nativeapp/ui/activity/PurchaseInfoActivity.java

@@ -237,9 +237,7 @@ public class PurchaseInfoActivity extends BaseActivity  {
                     @Override
                     public void onSuccess(JSONObject data) {
                         JSONArray rows = data.getJSONArray("list");
-                        for (int i = 0; i < rows.size(); i++) {
-                            rows.getJSONObject(i).put("checkedStatus", false);
-                        }
+
                         dataList = rows;
                         if(dataList.size() > 0){
                             immediately_btn.setBackgroundColor(getResources().getColor(R.color.login_bk));
@@ -255,6 +253,18 @@ public class PurchaseInfoActivity extends BaseActivity  {
                                 }
                             });
                             reflashLoadData(rowbeans, cleaned);
+                            if (cleaned){
+                                for (int i = 0; i < dataList.size(); i++) {
+                                    JSONObject itemJson = dataList.getJSONObject(i);
+                                    Integer status = itemJson.getInteger("status");
+                                    if (status.equals(IntegerEnum.ORDER_STA_PAYCOMPLETE.getCode())){
+                                        itemJson.put("checkedStatus", true);
+                                    }else {
+                                        itemJson.put("checkedStatus", false);
+                                    }
+
+                                }
+                            }
                             emptyShow(false);
                         }else {
                             emptyShow(true);
@@ -296,7 +306,9 @@ public class PurchaseInfoActivity extends BaseActivity  {
         if (enabled){
             all_btn.setChecked(true);
             for (int i = 0; i < rows.size(); i++) {
-                rows.get(i).checkedStatus = true;
+                if (rows.get(i).status.equals(IntegerEnum.ORDER_STA_PAYCOMPLETE.getCode())){
+                    rows.get(i).checkedStatus = true;
+                }
             }
         }
     }

+ 0 - 1
app/src/main/res/layout/activity_splash.xml

@@ -2,7 +2,6 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@mipmap/splash_png"
     xmlns:tools="http://schemas.android.com/tools">
 
     <LinearLayout

+ 11 - 2
build.gradle

@@ -2,8 +2,13 @@
 apply from: "config.gradle"
 buildscript {
     repositories {
+        maven {
+            url 'https://maven.aliyun.com/repository/public/'
+        }
+        // 如果你还需要其他官方仓库,可以继续添加
+        mavenCentral() // 或者 jcenter(),取决于你的需求
         google()
-        jcenter()
+//        jcenter()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:7.1.1'
@@ -15,8 +20,12 @@ buildscript {
 
 allprojects {
     repositories {
+        maven {
+            url 'https://maven.aliyun.com/repository/public/'
+        }
+        mavenCentral()
         google()
-        jcenter()
+//        jcenter()
     }
 }