Commit ce0d8a5c by Yu_Tung

version:1.0.10 20200918

增加功能: 增加crash report功能
parent 73569019
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
apply plugin: 'com.google.gms.google-services'
apply plugin: 'io.fabric'
android { android {
compileSdkVersion 29 compileSdkVersion 29
...@@ -9,7 +12,7 @@ android { ...@@ -9,7 +12,7 @@ android {
targetSdkVersion 29 targetSdkVersion 29
versionCode 1 versionCode 1
versionName "1.0.9" versionName "1.0.10"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }
buildTypes { buildTypes {
...@@ -24,6 +27,10 @@ dependencies { ...@@ -24,6 +27,10 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'com.crashlytics.sdk.android:crashlytics:2.9.6'
implementation 'com.google.firebase:firebase-core:11.8.0'
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test:runner:1.2.0' androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
...@@ -46,4 +53,16 @@ dependencies { ...@@ -46,4 +53,16 @@ dependencies {
// FFmpeg // FFmpeg
implementation 'com.arthenica:mobile-ffmpeg-full:4.3.2' implementation 'com.arthenica:mobile-ffmpeg-full:4.3.2'
// implementation 'com.google.firebase:firebase-analytics:17.5.0'
// // Recommended: Add the Firebase SDK for Google Analytics.
// implementation ("com.google.android.gms:play-services-base:+") {
// force = true
// }
//
// // Add the Firebase Crashlytics SDK.
// implementation 'com.google.firebase:firebase-crashlytics:17.2.1'
} }
{
"project_info": {
"project_number": "797999925815",
"firebase_url": "https://audiovisualrecord-3ffff.firebaseio.com",
"project_id": "audiovisualrecord-3ffff",
"storage_bucket": "audiovisualrecord-3ffff.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:797999925815:android:452ae45726406f529fcdb2",
"android_client_info": {
"package_name": "com.example.audiovisualrecord"
}
},
"oauth_client": [
{
"client_id": "797999925815-n8slnu2ikhag3a7ut7i1scidgr26gfq9.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.example.audiovisualrecord",
"certificate_hash": "ed88e30d655725a52fca78bf944816b2dd5c1b24"
}
},
{
"client_id": "797999925815-3h1v160tahrmql3st9plg4dn5ivfk39h.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyDNlbOLLFBDZj7cWrmA-AYXRcuBCRatVWA"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "797999925815-3h1v160tahrmql3st9plg4dn5ivfk39h.apps.googleusercontent.com",
"client_type": 3
}
]
}
}
}
],
"configuration_version": "1"
}
\ No newline at end of file
...@@ -114,6 +114,7 @@ public class MainActivity extends BaseActivity implements MainContract.View, Vie ...@@ -114,6 +114,7 @@ public class MainActivity extends BaseActivity implements MainContract.View, Vie
String sidData = ""; String sidData = "";
// String imageFilePhth; // String imageFilePhth;
// String videoFilePath; // String videoFilePath;
...@@ -409,6 +410,11 @@ public class MainActivity extends BaseActivity implements MainContract.View, Vie ...@@ -409,6 +410,11 @@ public class MainActivity extends BaseActivity implements MainContract.View, Vie
} }
if (requestCode == PICK_FILE_REQUEST_CODE && resultCode == RESULT_OK) { if (requestCode == PICK_FILE_REQUEST_CODE && resultCode == RESULT_OK) {
try {
Uri selectedFile = data.getData();
}catch (NullPointerException e){
Toast.makeText(this, "null", Toast.LENGTH_SHORT).show();
}
Uri selectedFile = data.getData(); Uri selectedFile = data.getData();
String filePath = MagicFileChooser.getAbsolutePathFromUri(this, selectedFile); String filePath = MagicFileChooser.getAbsolutePathFromUri(this, selectedFile);
// Log.e("filePath", filePath + "1"); // Log.e("filePath", filePath + "1");
......
...@@ -318,4 +318,5 @@ ...@@ -318,4 +318,5 @@
app:layout_constraintVertical_bias="0.509" app:layout_constraintVertical_bias="0.509"
app:layout_constraintWidth_percent="0.2" /> app:layout_constraintWidth_percent="0.2" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:hint="@string/login_account_hint" android:hint="@string/login_account_hint"
android:text="N000042089"
android:textColorHint="@color/white" android:textColorHint="@color/white"
android:paddingStart="100dp" android:paddingStart="100dp"
app:layout_constraintWidth_percent="0.9" app:layout_constraintWidth_percent="0.9"
...@@ -49,14 +49,14 @@ ...@@ -49,14 +49,14 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/guide_line_horizontal_45" app:layout_constraintTop_toBottomOf="@id/guide_line_horizontal_45"
android:paddingLeft="100dp" /> android:paddingLeft="100dp" />
<!-- android:text="N000158385"--> <!-- android:text="N000042089" -->
<EditText <EditText
android:id="@+id/edit_password" android:id="@+id/edit_password"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:hint="@string/login_password_hint" android:hint="@string/login_password_hint"
android:text="566345"
android:inputType="textPassword" android:inputType="textPassword"
android:textColorHint="@color/white" android:textColorHint="@color/white"
android:paddingStart="100dp" android:paddingStart="100dp"
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
app:layout_constraintHeight_percent="0.08" app:layout_constraintHeight_percent="0.08"
app:layout_constraintTop_toBottomOf="@id/guide_line_horizontal_56" app:layout_constraintTop_toBottomOf="@id/guide_line_horizontal_56"
android:paddingLeft="100dp" /> android:paddingLeft="100dp" />
<!-- android:text="781122222"--> <!-- android:text="566345" -->
<Button <Button
android:id="@+id/btn_login" android:id="@+id/btn_login"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment