Merge pull request #20 from mouyase/dev

4.5.2

.gitignore

@@ -47,11 +47,6 @@ captures/
 .idea/caches/build_file_checksums.ser
 .idea/modules.xml
 
-# Keystore files
-# Uncomment the following lines if you do not want to check your keystore files in.
-*.jks
-*.keystore
-
 # External native build folder generated in Android Studio 2.2 and later
 .externalNativeBuild
 
@@ -87,5 +82,5 @@ lint/reports/
 /debug
 /release
 
-keystore.properties
-bugly.properties
+.idea/
+app.properties

README.MD

@@ -1,14 +1,3 @@
 # PivisionM
 
-## 一款轻量级Pixiv第三方客户端
-
-### 待实现功能
-
- - [x] 直连Pixiv~~
- - [x] 多种连接模式~~
- - [ ] 多图页面直接显示
-
-### 待修复问题
-
- - [x] 保存位置选择只显示一行~~
- - [x] 搜索只能点击一次
+## 一款轻量级Pixiv第三方客户端

app.properties.example

@@ -0,0 +1,9 @@
+#签名相关
+storeFile=
+storePassword=
+keyAlias=
+keyPassword=
+
+#MobSDK
+appKey=
+appSecret=

app/build.gradle

@@ -2,30 +2,29 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
+def APP_PROPERTIES = new Properties()
+APP_PROPERTIES.load(new FileInputStream(project.rootProject.file("app.properties")))
+
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
     defaultConfig {
         applicationId "tech.yojigen.pivisionm"
-        minSdkVersion 19
-        targetSdkVersion 29
-        versionCode 443008
-        versionName '4.4.3(443008)'
-        vectorDrawables.useSupportLibrary = true
-        multiDexEnabled = true
+        minSdkVersion 23
+        targetSdkVersion 30
+        versionCode 452000
+        versionName '4.5.2'
+        vectorDrawables.useSupportLibrary true
+        multiDexEnabled true
     }
     dexOptions {
         preDexLibraries = false
     }
     signingConfigs {
-        releaseConfig {
-            def keystoreProperties = new Properties()
-            def keystorePropertiesFile = project.rootProject.file("keystore.properties")
-            keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
-
-            storeFile file(keystoreProperties['storeFile'])
-            storePassword keystoreProperties['storePassword']
-            keyAlias keystoreProperties['keyAlias']
-            keyPassword keystoreProperties['keyPassword']
+        config {
+            storeFile file(APP_PROPERTIES['storeFile'])
+            storePassword APP_PROPERTIES['storePassword']
+            keyAlias APP_PROPERTIES['keyAlias']
+            keyPassword APP_PROPERTIES['keyPassword']
         }
     }
 //    applicationVariants.all { variant ->
@@ -41,14 +40,14 @@ android {
 //            shrinkResources true
 //            proguardFiles 'proguard-rules.pro'
             debuggable = true
-            signingConfig signingConfigs.releaseConfig
+            signingConfig signingConfigs.config
         }
         release {
 //            minifyEnabled true
             zipAlignEnabled true
 //            shrinkResources true
 //            proguardFiles 'proguard-rules.pro'
-            signingConfig signingConfigs.releaseConfig
+            signingConfig signingConfigs.config
         }
 
     }
@@ -61,45 +60,54 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'com.android.support:multidex:1.0.3'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'com.google.android.material:material:1.0.0'
+    //noinspection GradleDependency
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    //noinspection GradleDependency
+    implementation 'com.google.android.material:material:1.4.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 
-//    implementation 'com.squareup.okhttp3:okhttp:4.2.0'
-    //向下兼容4.4
-    implementation 'com.squareup.okhttp3:okhttp:3.12.0'
-    implementation 'com.squareup.okhttp3:logging-interceptor:3.12.6'
+    //noinspection GradleDependency
+    implementation 'com.squareup.okhttp3:okhttp:3.14.9'
+    //noinspection GradleDependency
+    implementation 'com.squareup.okhttp3:logging-interceptor:3.14.9'
 
-    implementation 'com.squareup.retrofit2:retrofit:2.6.1'
-    implementation 'com.squareup.retrofit2:converter-gson:2.6.1'
-    implementation 'com.squareup.retrofit2:adapter-rxjava:2.0.2'
+    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
+    implementation 'com.squareup.retrofit2:adapter-rxjava:2.7.1'
 
     implementation 'io.reactivex:rxandroid:1.1.0'
-    implementation 'io.reactivex:rxjava:1.1.1'
+    implementation 'io.reactivex:rxjava:1.3.8'
 
-    implementation 'com.github.bumptech.glide:glide:4.9.0'
-    implementation 'com.github.bumptech.glide:okhttp3-integration:4.9.0'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
-    annotationProcessor 'androidx.annotation:annotation:1.1.0'
+    implementation 'com.github.bumptech.glide:glide:4.11.0'
+    implementation 'com.github.bumptech.glide:okhttp3-integration:4.11.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
+    annotationProcessor 'androidx.annotation:annotation:1.3.0'
 
-    implementation 'com.makeramen:roundedimageview:2.2.1'
+    implementation 'com.makeramen:roundedimageview:2.3.0'
 
     implementation 'com.commit451:PhotoView:1.2.4'
 
-    implementation 'me.gujun.android.taggroup:library:1.4@aar'
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    //升级了tag模块全挂
+    //noinspection GradleDependency
+    implementation 'me.gujun.android.taggroup:library:1.4'
+
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+
+    implementation 'com.tencent.bugly:crashreport_upgrade:1.5.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
 
-    implementation 'com.tencent.bugly:crashreport_upgrade:1.4.2'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'org.apache.commons:commons-lang3:3.9'
+
+
+    // webkit模块
+    implementation 'androidx.webkit:webkit:1.4.0'
 }
 
-//apply plugin: 'bugly'
+apply plugin: 'com.mob.sdk'
+
+MobSDK {
+    appKey APP_PROPERTIES['appKey']
+    appSecret APP_PROPERTIES['appSecret']
 
-//bugly {
-//    def buglyProperties = new Properties()
-//    def buglyPropertiesFile = project.rootProject.file("bugly.properties")
-//    buglyProperties.load(new FileInputStream(buglyPropertiesFile))
-//
-//    appId = buglyProperties['APP_ID']
-//    appKey = buglyProperties['APP_KEY']
-//}
+    MobPush {}
+}

app/src/main/AndroidManifest.xml

@@ -18,10 +18,11 @@
         tools:targetApi="q">
         <activity
             android:name="com.reiya.pixiv.other.SplashActivity"
-            android:screenOrientation="portrait"
+            android:label="@string/app_name"
             android:theme="@style/Splash">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
             <intent-filter>
@@ -32,32 +33,32 @@
 
                 <data android:scheme="http" />
                 <data android:scheme="https" />
+                <data android:host="pixiv.me" />
+                <data android:host="pixiv.net" />
+                <data android:host="www.pixiv.me" />
                 <data android:host="www.pixiv.net" />
                 <data android:pathPrefix="/member.php" />
                 <data android:pathPrefix="/member_illust.php" />
                 <data android:pathPrefix="/artworks" />
                 <data android:pathPrefix="/en/artworks" />
+                <data android:pathPrefix="/user" />
+                <data android:pathPrefix="/i" />
             </intent-filter>
         </activity>
         <activity
             android:name="com.reiya.pixiv.work.ViewActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/Translucent" />
         <activity
             android:name="com.reiya.pixiv.zoom.ZoomActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/Translucent" />
         <activity
             android:name="com.reiya.pixiv.group.GroupViewActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/Translucent" />
         <activity
             android:name="com.reiya.pixiv.gif.GifActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/Translucent" />
         <activity
             android:name="com.reiya.pixiv.search.SearchActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/Translucent"
             android:windowSoftInputMode="adjustPan">
             <meta-data
@@ -66,70 +67,54 @@
         </activity>
         <activity
             android:name="com.reiya.pixiv.profile.ProfileActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/Translucent" />
         <activity
             android:name="com.reiya.pixiv.collection.FavoriteWorksActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/Translucent" />
         <activity
             android:name="com.reiya.pixiv.concern.FavoriteUsersActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/Translucent" />
         <activity
             android:name="com.reiya.pixiv.history.HistoryActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/Translucent" />
         <activity
             android:name="com.reiya.pixiv.spotlight.SpotlightActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/Translucent" />
         <activity
             android:name="com.reiya.pixiv.article.ArticleActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/Translucent" />
         <activity
             android:name="com.reiya.pixiv.other.SettingsActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/Translucent" />
         <activity
             android:name="com.reiya.pixiv.comment.CommentActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/Translucent" />
         <activity
             android:name="com.reiya.pixiv.grid.GridActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/Translucent" />
         <activity
             android:name="com.reiya.pixiv.historyranking.HistoryRankingActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/Translucent" />
         <activity
             android:name="com.reiya.pixiv.download.DownloadActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/Translucent" />
         <activity
             android:name="com.reiya.pixiv.other.OpenSourceActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/Translucent" />
 
         <activity
             android:name="com.reiya.pixiv.ranking.RankingActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/Translucent" />
 
         <activity
             android:name="com.reiya.pixiv.main.MainActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/TranslucentNoActionBar" />
         <activity
             android:name="com.reiya.pixiv.search.KeywordActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/Translucent"
             android:windowSoftInputMode="adjustPan" />
         <activity
             android:name="com.reiya.pixiv.other.LoginActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/Translucent" />
 
         <service android:name="com.reiya.pixiv.service.DownloadService" />
@@ -147,6 +132,11 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/provider_paths" />
         </provider>
+
+        <activity
+            android:name="com.reiya.pixiv.other.BrowserActivity"
+            android:theme="@style/Theme.AppCompat.NoActionBar" />
+        <activity android:name="com.reiya.pixiv.other.ExitActivity" />
     </application>
 
     <uses-permission