xiaoyan159/NavinfoOutDoor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 分段上传功能完成-M9Tag

Browse Source
This commit is contained in:
xiaoyan 2022-10-26 10:00:41 +08:00
parent 8706bb1243
commit f440f09ca4
6 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -12,8 +12,8 @@ android {
applicationId "com.navinfo.outdoor" applicationId "com.navinfo.outdoor"
minSdkVersion 23 minSdkVersion 23
targetSdkVersion 30 targetSdkVersion 30
versionCode 27 versionCode 28
versionName "8.220907" versionName "8.221021"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }
lintOptions { lintOptions {

4
app/src/main/java/com/navinfo/outdoor/activity/LoginActivity.java
View File

@ -20,6 +20,7 @@ import android.widget.Toast;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.github.lazylibrary.util.AppUtils;
import com.github.lazylibrary.util.FileUtils; import com.github.lazylibrary.util.FileUtils;
import com.lzy.okgo.model.HttpParams; import com.lzy.okgo.model.HttpParams;
import com.lzy.okgo.model.Progress; import com.lzy.okgo.model.Progress;
@ -32,6 +33,7 @@ import com.navinfo.outdoor.http.Callback;
import com.navinfo.outdoor.http.HttpInterface; import com.navinfo.outdoor.http.HttpInterface;
import com.navinfo.outdoor.http.OkGoBuilder; import com.navinfo.outdoor.http.OkGoBuilder;
import com.navinfo.outdoor.http.UploadCallBack; import com.navinfo.outdoor.http.UploadCallBack;
import com.navinfo.outdoor.util.APKVersionCodeUtils;
import com.navinfo.outdoor.util.Base64; import com.navinfo.outdoor.util.Base64;
import com.navinfo.outdoor.util.Md5Util; import com.navinfo.outdoor.util.Md5Util;
import com.navinfo.outdoor.util.TimestampUtil; import com.navinfo.outdoor.util.TimestampUtil;
@ -125,7 +127,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
navInfoEditor = navInfo.edit(); navInfoEditor = navInfo.edit();
TextView tvRegister = findViewById(R.id.tv_register); TextView tvRegister = findViewById(R.id.tv_register);
TextView tvView = findViewById(R.id.tv_view); TextView tvView = findViewById(R.id.tv_view);
tvView.setText(Constant.NAVIN_FO); tvView.setText("版本号:"+AppUtils.getVerName(this));
etLoginName = findViewById(R.id.et_login_name); etLoginName = findViewById(R.id.et_login_name);
etLoginPaw = findViewById(R.id.et_login_paw); etLoginPaw = findViewById(R.id.et_login_paw);
TextView tvForgetPaw = findViewById(R.id.tv_forget_paw); TextView tvForgetPaw = findViewById(R.id.tv_forget_paw);

2
app/src/main/java/com/navinfo/outdoor/activity/MainActivity.java
View File

@ -20,6 +20,7 @@ import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import androidx.core.content.FileProvider; import androidx.core.content.FileProvider;
import com.github.lazylibrary.util.AppUtils;
import com.hjq.permissions.OnPermissionCallback; import com.hjq.permissions.OnPermissionCallback;
import com.hjq.permissions.Permission; import com.hjq.permissions.Permission;
import com.hjq.permissions.XXPermissions; import com.hjq.permissions.XXPermissions;
@ -493,5 +494,6 @@ public class MainActivity extends BaseActivity {
Constant.REFRESH_TOKEN = navInfo.getString("refresh_token", null); Constant.REFRESH_TOKEN = navInfo.getString("refresh_token", null);
Constant.ACCESS_TOKEN = navInfo.getString("access_token", null); Constant.ACCESS_TOKEN = navInfo.getString("access_token", null);
initPermission(); initPermission();
((TextView)findViewById(R.id.tv_view)).setText("版本号:"+ AppUtils.getVerName(this));
} }
} }

1
app/src/main/java/com/navinfo/outdoor/api/Constant.java
View File

@ -175,7 +175,6 @@ public class Constant {
public static final String INTENT_DETAIL = "Detail";//poiEntity 的detail public static final String INTENT_DETAIL = "Detail";//poiEntity 的detail
public static SlidingUpPanelLayout SLIDING_LAYOUT = null;//設置 public static SlidingUpPanelLayout SLIDING_LAYOUT = null;//設置
public static TencentMap.OnMarkerClickListener markerClickListener = null; public static TencentMap.OnMarkerClickListener markerClickListener = null;
public static final String NAVIN_FO = "12.10";//版本日期
//marker //marker
public static final BitmapDescriptor MARKER_CHARGE_SHOW = BitmapDescriptorFactory.fromResource(R.drawable.marker_charge_show); public static final BitmapDescriptor MARKER_CHARGE_SHOW = BitmapDescriptorFactory.fromResource(R.drawable.marker_charge_show);

11
app/src/main/res/layout/activity_main.xml
View File

@ -6,5 +6,14 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/start_bg" android:background="@drawable/start_bg"
tools:context="activity.MainActivity"> tools:context="activity.MainActivity">
<TextView
android:id="@+id/tv_view"
android:layout_width="wrap_content"
android:textColor="@color/white"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:layout_marginBottom="20dp"
/>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

2
xrecyclerview/build.gradle
View File

@ -3,7 +3,7 @@ apply plugin: 'com.android.library'
android { android {
compileSdkVersion 30 compileSdkVersion 30
buildToolsVersion '30.0.3' buildToolsVersion '29.0.2'
defaultConfig { defaultConfig {
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 30 targetSdkVersion 30