ソースを参照

Apex land 增加上传位置时间和速度,修改部分提示消息

Ray Zhang 6 年 前
コミット
4ec6b4a010

+ 1 - 1
ApexDrivers/apexcrm/build.gradle

@@ -17,7 +17,7 @@ android {
         minSdkVersion 23
         targetSdkVersion 26
         versionCode 1
-        versionName "1.16.40511"
+        versionName "1.16.40964"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 

+ 3 - 3
ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/ApexDriverApplication.java

@@ -663,7 +663,7 @@ public class ApexDriverApplication extends Application {
             break;
             case BackgroundReportTypeReject: {
 
-                String reason = "Driver " + user +" rejected to report location";
+                String reason = "Reject ping by app setting driver: " + user ;
                 rejectReportLocation(reason,orderId,locationId);
             }
             break;
@@ -685,7 +685,7 @@ public class ApexDriverApplication extends Application {
                                 @Override
                                 public void onClick(DialogInterface dialog, int which) {
 
-                                    String reason = "Driver " + user +" cancel to report location";
+                                    String reason = "Driver " + user +" choose cancel of report location";
                                     rejectReportLocation(reason,orderId,locationId);
                                 }
                             })
@@ -798,7 +798,7 @@ public class ApexDriverApplication extends Application {
 
                         } else {
 
-                            String reason = "Driver " + user +" rejected to report location";
+                            String reason = "Reject tracing byapp setting Driver: " + user ;
                             rejectReportLocation(reason,orderID, locationId);
                         }
 

+ 9 - 0
ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/update/UpdateActivity.java

@@ -752,11 +752,20 @@ public class UpdateActivity extends BasicActivity implements UpdateAdapter.Updat
             String locationStr = null;
             if (location != null) {
                 locationStr = location.getLatitude() + "," + location.getLongitude();
+                params.putLong("timestamp",location.getTime() / 1000);
+                params.putFloat("speed",location.getSpeed());
             } else {
                 locationStr = "-999,-999";
             }
             params.putString("location",locationStr);
+            params.putBoolean("user_reject",false);
         }
+//        else
+//        {
+//        //android 没有定位权限不能使用,这部分不需要;
+//            params.putBoolean("user_reject",false);
+//            params.putBoolean("reason","Location Denied by app setting");
+//        }
 
         ArrayList<String> emptyArr = new ArrayList<>();
 

+ 4 - 2
ApexDrivers/racameralib/build.gradle

@@ -17,8 +17,10 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            minifyEnabled true
+            zipAlignEnabled true
+//            shrinkResources true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
         }
     }