Merge pull request #23 from idealclover/dev

v0.2.1.5
WheretoSleepinNJU · Feb 23, 2019 · d5039fd · d5039fd
2 parents 93cbf74 + 6ae0e66
commit d5039fd
Show file tree

Hide file tree

Showing 101 changed files with 488 additions and 792 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,14 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
     defaultConfig {
-//        applicationId "com.idealclover.njuclassschedule"
-        applicationId "com.idealclover.wheretosleepinnju"
+        applicationId "com.lilystudio.wheretosleepinnju"
         minSdkVersion 21
-        targetSdkVersion 27
-        versionCode 3
-        versionName "0.2.0"
+        targetSdkVersion 28
+        versionCode 4
+        versionName "0.2.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -35,13 +34,15 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     testImplementation 'junit:junit:4.12'
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:design:27.1.1'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:design:28.0.0'
     implementation 'org.jsoup:jsoup:1.10.3'
     implementation 'io.reactivex:rxjava:1.1.3'
     implementation 'io.reactivex:rxandroid:1.0.1'
     implementation 'com.google.code.gson:gson:2.8.2'
     implementation 'com.zhy:okhttputils:2.6.2'
+    implementation 'com.tencent.bugly:crashreport_upgrade:latest.release'
+    implementation 'com.tencent.bugly:nativecrashreport:latest.release'
 }
 
 
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -61,4 +61,8 @@
 -keep class okio.**{*;}
 
 #glide
--dontwarn com.bumptech.glide.**
+-dontwarn com.bumptech.glide.**
+
+#bugly
+-dontwarn com.tencent.bugly.**
+-keep public class com.tencent.bugly.**{*;}
diff --git a/...tosleepinnju/ExampleInstrumentedTest.java → ...tosleepinnju/ExampleInstrumentedTest.java b/...tosleepinnju/ExampleInstrumentedTest.java → ...tosleepinnju/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package com.idealclover.wheretosleepinnju;
+package com.lilystudio.wheretosleepinnju;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
@@ -21,6 +21,6 @@ public void useAppContext() throws Exception {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getTargetContext();
 
-        assertEquals("com.idealclover.wheretosleepinnju", appContext.getPackageName());
+        assertEquals("com.lilystudio.wheretosleepinnju", appContext.getPackageName());
     }
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,45 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.idealclover.wheretosleepinnju">
+    package="com.lilystudio.wheretosleepinnju">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.CAMERA" />
+    <!--<uses-permission android:name="android.permission.CAMERA" />-->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <!--<uses-permission android:name="android.permission.READ_LOGS" />-->
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
     <!--android:roundIcon="@mipmap/ic_launcher_round"-->
 
     <application
-        android:name=".app.app"
+        android:name="com.lilystudio.wheretosleepinnju.app.app"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/nanjingBlueTheme">
         <activity
-            android:name=".course.CourseActivity"
+            android:name="com.lilystudio.wheretosleepinnju.course.CourseActivity"
             android:launchMode="singleTask">
             <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".setting.SettingActivity"></activity>
-        <activity android:name=".impt.ImptActivity"></activity>
-        <activity android:name=".add.AddActivity"></activity>
-        <activity android:name=".mg.MgActivity"></activity>
-        <activity android:name=".about.AboutActivity"></activity>
-        <activity android:name=".conf.ConfActivity"></activity>
+        <activity android:name="com.lilystudio.wheretosleepinnju.setting.SettingActivity" />
+        <activity android:name="com.lilystudio.wheretosleepinnju.impt.ImptActivity" />
+        <activity android:name="com.lilystudio.wheretosleepinnju.add.AddActivity" />
+        <activity android:name="com.lilystudio.wheretosleepinnju.mg.MgActivity" />
+        <activity android:name="com.lilystudio.wheretosleepinnju.about.AboutActivity" />
+        <activity android:name="com.lilystudio.wheretosleepinnju.conf.ConfActivity" />
         <!--<activity android:name=".school.SchoolActivity"></activity>-->
-
-        <receiver android:name=".widget.OneWidget">
+        <activity
+            android:name="com.tencent.bugly.beta.ui.BetaActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize|locale"
+            android:theme="@android:style/Theme.Translucent" />
+        <receiver android:name="com.lilystudio.wheretosleepinnju.widget.OneWidget">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
             <meta-data
                 android:name="android.appwidget.provider"
                 android:resource="@xml/widget_one" />
         </receiver>
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="${applicationId}.fileProvider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/provider_paths"/>
+        </provider>
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/BaseView.java b/app/src/main/java/com/idealclover/wheretosleepinnju/BaseView.java
diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/about/AboutContract.java b/app/src/main/java/com/idealclover/wheretosleepinnju/about/AboutContract.java
diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/about/AboutPresenter.java b/app/src/main/java/com/idealclover/wheretosleepinnju/about/AboutPresenter.java
diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/data/bean/Version.java b/app/src/main/java/com/idealclover/wheretosleepinnju/data/bean/Version.java
diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/impt/ImptModel.java b/app/src/main/java/com/idealclover/wheretosleepinnju/impt/ImptModel.java
diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/setting/SettingContract.java b/app/src/main/java/com/idealclover/wheretosleepinnju/setting/SettingContract.java
diff --git a/app/src/main/java/com/idealclover/wheretosleepinnju/utils/CheckUpdateUtil.java b/app/src/main/java/com/idealclover/wheretosleepinnju/utils/CheckUpdateUtil.java