nezumi/PRM392
1
0
Fork 0
mirror of https://github.com/Nezumi-2711/PRM392.git synced 2026-09-22 13:48:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Update

Browse Source
This commit is contained in:
phanhuuloi27
2022-07-19 14:50:57 +07:00
parent 6570142066
commit 2a7ea6022b
42 changed files with 2422 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Foodify/app/build.gradle
+3 -3
View File
@@ -10,14 +10,13 @@ android {
minSdk 23
targetSdk 30
versionCode 1
versionName "88.0"
versionName "87.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
@@ -90,7 +89,8 @@ dependencies {
implementation 'com.daimajia.slider:library:1.1.5@aar'
implementation "androidx.browser:browser:1.3.0"
implementation 'com.github.Piashsarker:AndroidAppUpdateLibrary:1.0.4'
implementation project(':appupdate')
}
Foodify/app/src/main/AndroidManifest.xml
-13
View File
@@ -11,8 +11,6 @@
<uses-permission android:name="android.permission.READ_PHONE_NUMBERS" />
<uses-permission android:name="android.permission.RECEIVE_SMS" />
<uses-permission android:name="android.permission.READ_SMS" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
<application
android:allowBackup="true"
@@ -22,21 +20,10 @@
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:requestLegacyExternalStorage="true"
android:theme="@style/Theme.Foodify"
tools:replace="android:theme"
tools:targetApi="31">
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.provider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/provider_paths"/>
</provider>
<receiver android:name=".OTP_Receiver">
<intent-filter>
Foodify/app/src/main/java/com/waterbase/foodify/Home.java
+28 -70
View File
@@ -38,11 +38,11 @@ import androidx.recyclerview.widget.RecyclerView;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import com.andremion.counterfab.CounterFab;
import com.azhon.appupdate.manager.DownloadManager;
import com.daimajia.slider.library.Animations.DescriptionAnimation;
import com.daimajia.slider.library.SliderLayout;
import com.daimajia.slider.library.SliderTypes.BaseSliderView;
import com.daimajia.slider.library.SliderTypes.TextSliderView;
import com.dcastalia.localappupdate.DownloadApk;
import com.firebase.ui.database.FirebaseRecyclerAdapter;
import com.firebase.ui.database.FirebaseRecyclerOptions;
import com.google.android.gms.tasks.OnCompleteListener;
@@ -98,6 +98,8 @@ public class Home extends AppCompatActivity implements NavigationView.OnNavigati
HashMap<String, String> image_list;
SliderLayout mSlider;
DownloadManager manager = null;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -180,7 +182,7 @@ public class Home extends AppCompatActivity implements NavigationView.OnNavigati
database = FirebaseDatabase.getInstance();
category = database.getReference("Category");
if(Double.parseDouble(versionNameApp) < Double.parseDouble(Common.versionAppNewest)){
if (Double.parseDouble(versionNameApp) < Double.parseDouble(Common.versionAppNewest)) {
alertDialogUpdate();
}
@@ -239,36 +241,30 @@ public class Home extends AppCompatActivity implements NavigationView.OnNavigati
//Setup Slider
setupSlider();
if(!NotificationManagerCompat.from(this).areNotificationsEnabled()){
if (!NotificationManagerCompat.from(this).areNotificationsEnabled()) {
showNotificationAlertDialog("Hãy bật quyền thông báo trên thiết bị của bạn để chúng thôi có thể cung cấp thông tin cho bạn một cách nhanh nhất!");
}
}
private void alertDialogUpdate() {
AlertDialog alertDialog = new AlertDialog.Builder(Home.this)
.setTitle("Thông báo!")
.setMessage("Hiện tại đã có phiên bản mới hơn! Vui lòng cập nhật ứng dụng để mang đến những trải nghiệm tốt nhất!")
.setPositiveButton("Đồng ý", null)
.setNegativeButton("Để sau", null)
.create();
String url = "https://github.com/Nezumi2711/PRM392/raw/main/app-debug.apk";
manager = new DownloadManager.Builder(Home.this)
.apkUrl(url)
.apkName("app-debug.apk")
.smallIcon(R.mipmap.ic_launcher)
.apkVersionCode(3)
.apkSize("26.5")
.showNotification(false)
.showBgdToast(false)
.apkVersionName(Common.versionAppNewest + ".0 ")
.apkDescription("1. Sửa lỗi đặt hàng!\n2. Cải thiện hiệu suất\n3. Tối ưu giao diện\n4. Cập nhật thư viện app.")
.dialogProgressBarColor(0xFFFF5353)
.jumpInstallPage(false)
.build();
alertDialog.setOnShowListener(new DialogInterface.OnShowListener() {
@Override
public void onShow(DialogInterface dialog) {
Button agree = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE);
agree.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
checkWriteExternalStoragePermission();
alertDialog.dismiss();
}
});
}
});
alertDialog.show();
manager.download();
}
private void alertDialogNewest() {
@@ -280,44 +276,6 @@ public class Home extends AppCompatActivity implements NavigationView.OnNavigati
alertDialog.show();
}
private void checkWriteExternalStoragePermission() {
if (ActivityCompat.checkSelfPermission(Home.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
// If we have permission than we can Start the Download the task
downloadTask();
} else {
// If we don't have permission than requesting the permission
requestWriteExternalStoragePermission();
}
}
private void requestWriteExternalStoragePermission() {
if (ActivityCompat.checkSelfPermission(Home.this, Manifest.permission.WRITE_EXTERNAL_STORAGE)!= PackageManager.PERMISSION_GRANTED) {
ActivityCompat.requestPermissions(Home.this, new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE}, MY_PERMISSION_REQUEST_WRITE_EXTERNAL_STORAGE);
} else{
ActivityCompat.requestPermissions(Home.this,new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE}, MY_PERMISSION_REQUEST_WRITE_EXTERNAL_STORAGE);
}
}
@Override
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
if (requestCode==MY_PERMISSION_REQUEST_WRITE_EXTERNAL_STORAGE && grantResults.length == 1 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
downloadTask();
} else {
Toast.makeText(Home.this, "Permission Not Granted.", Toast.LENGTH_SHORT).show();
}
}
private void downloadTask() {
// This @DownloadApk class is provided by our library
// Pass the Context when creating object of DownloadApk
String url = "https://github.com/Nezumi2711/PRM392/raw/main/app-debug.apk";
DownloadApk downloadApk = new DownloadApk(Home.this);
downloadApk.startDownloadingApk(url, "Update 2.0");
}
private void showNotificationAlertDialog(String msg) {
AlertDialog alertDialog = new AlertDialog.Builder(Home.this)
.setTitle("Thông báo!")
@@ -358,7 +316,7 @@ public class Home extends AppCompatActivity implements NavigationView.OnNavigati
alertDialog.show();
TextView textView = (TextView) alertDialog.findViewById(android.R.id.message);
Typeface face=Typeface.createFromAsset(getAssets(),"fonts/regular.ttf");
Typeface face = Typeface.createFromAsset(getAssets(), "fonts/regular.ttf");
textView.setTypeface(face);
}
@@ -479,7 +437,7 @@ public class Home extends AppCompatActivity implements NavigationView.OnNavigati
} else if (id == R.id.nav_favorites) {
startActivity(new Intent(Home.this, FavoritesActivity.class));
} else if (id == R.id.nav_update) {
if(Double.parseDouble(versionNameApp) < Double.parseDouble(Common.versionAppNewest)){
if (Double.parseDouble(versionNameApp) < Double.parseDouble(Common.versionAppNewest)) {
alertDialogUpdate();
} else {
alertDialogNewest();
@@ -529,7 +487,7 @@ public class Home extends AppCompatActivity implements NavigationView.OnNavigati
FirebaseMessaging.getInstance().subscribeToTopic(Common.topicName);
//Write value
Paper.book().write("sub_new", "true");
if(!NotificationManagerCompat.from(Home.this).areNotificationsEnabled()){
if (!NotificationManagerCompat.from(Home.this).areNotificationsEnabled()) {
showNotificationAlertDialog("Oops, máy bạn chưa được cấp quyền thông báo! Bạn có muốn bật để nhận thông báo từ hệ thống không?");
}
} else {
@@ -652,11 +610,11 @@ public class Home extends AppCompatActivity implements NavigationView.OnNavigati
}
} else {
waitingDialog.dismiss();
if(TextUtils.isEmpty(edtPassword.getText().toString())){
if (TextUtils.isEmpty(edtPassword.getText().toString())) {
edtPassword.setError("Vui lòng điền vào trường này!");
} else if(TextUtils.isEmpty(edtNewPassword.getText().toString())){
} else if (TextUtils.isEmpty(edtNewPassword.getText().toString())) {
edtNewPassword.setError("Vui lòng điền vào trường này!");
} else if(TextUtils.isEmpty(edtRepeatPassword.getText().toString())){
} else if (TextUtils.isEmpty(edtRepeatPassword.getText().toString())) {
edtRepeatPassword.setError("Vui lòng điền vào trường này!");
}
}
@@ -684,7 +642,7 @@ public class Home extends AppCompatActivity implements NavigationView.OnNavigati
@Override
public void onBackPressed() {
if(backPressedTime + 2000 > System.currentTimeMillis()) {
if (backPressedTime + 2000 > System.currentTimeMillis()) {
super.onBackPressed();
return;
} else {
Foodify/app/src/main/res/values/strings.xml
+10
View File
@@ -8,4 +8,14 @@
<string name="nav_header_desc">Navigation header</string>
<string name="action_settings">Settings</string>
<string name="nav_header_title">Android Studio</string>
<string name="app_title">一個簡單好用的版本更新庫</string>
<string name="dialog_title">發現新版本</string>
<string name="dialog_msg">1.支持Android4.1及以上版本\n2.支持自定義下載過程\n3.支持通知欄進度條展示\n4.支持文字國際化\n5.使用Kotlin協程重構</string>
<string name="dialog_confirm">升級</string>
<string name="layout_msg">使用說明：三個方式不能並行 請等待一個方式下載完成在使用其他方式</string>
<string name="layout_custom_dialog">使用自己的對話框更新</string>
<string name="layout_simple_use">簡單易用</string>
<string name="layout_library_dialog">使用版本庫內置的對話框更新</string>
<string name="layout_cancel">取消下載</string>
</resources>