!12126 [MS][LITE] fix file path name
From: @sishuikang Reviewed-by: @zhanghaibo5,@zhang_xue_tong Signed-off-by: @zhanghaibo5
|
@ -7,8 +7,8 @@ android {
|
|||
applicationId "com.mindspore.himindspore"
|
||||
minSdkVersion 21
|
||||
targetSdkVersion 30
|
||||
versionCode 8
|
||||
versionName "1.2.1"
|
||||
versionCode 10
|
||||
versionName "1.2.3"
|
||||
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
javaCompileOptions {
|
|
@ -23,10 +23,10 @@ import retrofit2.http.Streaming;
|
|||
|
||||
public interface RetrofitService {
|
||||
|
||||
@GET("version.json")
|
||||
@GET("newversion.json")
|
||||
Call<UpdateInfoBean> getUpdateInfo();
|
||||
|
||||
@Streaming
|
||||
@GET("himindsporedemo.apk")
|
||||
@GET("MindSpore_inhand.apk")
|
||||
Observable<ResponseBody> downloadApk();
|
||||
}
|
|
@ -57,16 +57,8 @@ public class SplashActivity extends BaseActivity implements EasyPermissions.Perm
|
|||
private void initCountDownView() {
|
||||
cdvTime.setTime(3);
|
||||
cdvTime.start();
|
||||
cdvTime.setOnLoadingFinishListener(new CountDownView.OnLoadingFinishListener() {
|
||||
@Override
|
||||
public void finish() {
|
||||
Log.e("AAA","setOnLoadingFinishListener");
|
||||
startPermissionsTask();
|
||||
}
|
||||
});
|
||||
|
||||
cdvTime.setOnLoadingFinishListener(() -> startPermissionsTask());
|
||||
cdvTime.setOnClickListener(view -> {
|
||||
Log.e("AAA","setOnClickListener");
|
||||
cdvTime.stop();
|
||||
startPermissionsTask();
|
||||
});
|
||||
|
@ -147,15 +139,10 @@ public class SplashActivity extends BaseActivity implements EasyPermissions.Perm
|
|||
}
|
||||
|
||||
private void setHandler() {
|
||||
// new Handler().postDelayed(() -> {
|
||||
// enterMainView();
|
||||
// }, 3000);
|
||||
enterMainView();
|
||||
}
|
||||
|
||||
private void enterMainView() {
|
||||
Log.e("AAA","enterMainView");
|
||||
|
||||
Intent intent = new Intent();
|
||||
intent.setClass(SplashActivity.this, MainActivity.class);
|
||||
startActivity(intent);
|
|
@ -97,10 +97,6 @@ public class MainActivity extends BaseActivity<MainPresenter> implements MainCon
|
|||
});
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 初始化ViewPager数据
|
||||
*/
|
||||
private void initViewPager() {
|
||||
List<Fragment> fragments = new ArrayList<>();
|
||||
fragments.add(FragmentFactory.getInstance().getExperienceFragment());
|
||||
|
@ -159,10 +155,10 @@ public class MainActivity extends BaseActivity<MainPresenter> implements MainCon
|
|||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
|
||||
intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
|
||||
Uri contentUri = FileProvider.getUriForFile(MainActivity.this, "com.mindspore.himindspore.fileprovider",
|
||||
new File(getApkPath(), "HiMindSpore.apk"));
|
||||
new File(getApkPath(), "MindSpore_inhand.apk"));
|
||||
intent.setDataAndType(contentUri, "application/vnd.android.package-archive");
|
||||
} else {
|
||||
intent.setDataAndType(Uri.fromFile(new File(getApkPath(), "HiMindSpore.apk")), "application/vnd.android.package-archive");
|
||||
intent.setDataAndType(Uri.fromFile(new File(getApkPath(), "MindSpore_inhand.apk")), "application/vnd.android.package-archive");
|
||||
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||
}
|
||||
startActivity(intent);
|
||||
|
@ -192,7 +188,7 @@ public class MainActivity extends BaseActivity<MainPresenter> implements MainCon
|
|||
progressDialog.setProgressNumberFormat("%1d Mb/%2d Mb");
|
||||
progressDialog.setProgress(0);
|
||||
progressDialog.show();
|
||||
presenter.downloadApk(getApkPath(), "HiMindSpore.apk", new FileDownLoadObserver<File>() {
|
||||
presenter.downloadApk(getApkPath(), "MindSpore_inhand.apk", new FileDownLoadObserver<File>() {
|
||||
@Override
|
||||
public void onDownLoadSuccess(File file) {
|
||||
downSuccess();
|
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.8 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.7 KiB |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.3 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 3.2 KiB |
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.7 KiB |
Before Width: | Height: | Size: 780 B After Width: | Height: | Size: 780 B |
Before Width: | Height: | Size: 837 B After Width: | Height: | Size: 837 B |
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 3.6 KiB |
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 3.0 KiB |
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.7 KiB |
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 3.2 KiB |
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 2.0 KiB |
Before Width: | Height: | Size: 787 B After Width: | Height: | Size: 787 B |
Before Width: | Height: | Size: 841 B After Width: | Height: | Size: 841 B |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |
Before Width: | Height: | Size: 557 B After Width: | Height: | Size: 557 B |
Before Width: | Height: | Size: 437 B After Width: | Height: | Size: 437 B |
Before Width: | Height: | Size: 744 B After Width: | Height: | Size: 744 B |
Before Width: | Height: | Size: 556 B After Width: | Height: | Size: 556 B |
Before Width: | Height: | Size: 878 B After Width: | Height: | Size: 878 B |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 773 B After Width: | Height: | Size: 773 B |
Before Width: | Height: | Size: 813 B After Width: | Height: | Size: 813 B |
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 3.2 KiB |
Before Width: | Height: | Size: 6.0 KiB After Width: | Height: | Size: 6.0 KiB |
Before Width: | Height: | Size: 7.6 KiB After Width: | Height: | Size: 7.6 KiB |
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 3.7 KiB |
Before Width: | Height: | Size: 4.4 KiB After Width: | Height: | Size: 4.4 KiB |
Before Width: | Height: | Size: 8.7 KiB After Width: | Height: | Size: 8.7 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 22 KiB |
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 27 KiB |