!12126 [MS][LITE] fix file path name

From: @sishuikang
Reviewed-by: @zhanghaibo5,@zhang_xue_tong
Signed-off-by: @zhanghaibo5
This commit is contained in:
mindspore-ci-bot 2021-02-05 09:19:46 +08:00 committed by Gitee
commit 4cf59f39c9
380 changed files with 42 additions and 25 deletions

View File

@ -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 {

View File

@ -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();
}

View File

@ -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);

View File

@ -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();

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