Merge branch 'master' of https://gitee.com/bdnh/hippo

build.gradle

@@ -23,6 +23,7 @@ allprojects {
         jcenter()
         google()
         maven { url "https://jitpack.io" }
+        maven { url "https://raw.githubusercontent.com/Pgyer/mvn_repo_pgyer/master" }
     }
 }
 

mobile/assets/changelog.html

@@ -28,6 +28,7 @@
     修复：
     1.若干已知卡图错误；
     2.本地脚本问题；
+    3.更换自动更新源；
     优化：
     1.把过去的更新日志删了加快初启动速度；
     2.可以自行设置头像；

mobile/build.gradle

@@ -8,7 +8,7 @@ android {
         applicationId "cn.garymb.ygomobile"
         minSdkVersion 16
         targetSdkVersion 22
-        versionCode 33030722
+        versionCode 33030723
         versionName "3.3.3"
         flavorDimensions "versionCode"
         vectorDrawables.useSupportLibrary = true

mobile/src/main/AndroidManifest.xml

@@ -10,6 +10,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.READ_LOGS"/>
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
     <uses-permission android:name="android.permission.GET_TASKS"/>
@@ -190,29 +191,14 @@
             android:screenOrientation="behind"
             android:windowSoftInputMode="adjustResize|stateHidden" >
         </activity>
-
-        <activity
-            android:name="com.qihoo.appstore.common.updatesdk.lib.UpdateTipDialogActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:exported="false"
-            android:screenOrientation="portrait"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
-
-        <service
-            android:name="com.qihoo.appstore.updatelib.CheckUpdateService"
-            android:exported="false" />
-
         <provider
-            android:name="com.qihoo.appstore.updatelib.UpdateProvider"
-            android:authorities="cn.garymb.ygomobile"
-            android:grantUriPermissions="true"
-            android:exported="false">
+            android:name="com.pgyersdk.PgyerProvider"
+            android:authorities="${applicationId}.com.pgyer.provider"
+            android:exported="false"/>
         <meta-data
-            android:name="android.support.FILE_PROVIDER_PATHS"
-            android:resource="@xml/update_apk_path" />
-    </provider>
-
-
+            android:name="PGYER_APPID"
+            android:value="dd147e8542b85a64111d98290892d8bd" >
+        </meta-data>
     </application>
 
 </manifest>
\ No newline at end of file

mobile/src/main/java/cn/garymb/ygomobile/ui/home/HomeActivity.java

@@ -10,6 +10,7 @@ import android.support.design.widget.NavigationView;
 import android.support.v7.widget.DividerItemDecoration;
 import android.support.v7.widget.LinearLayoutManager;
 import android.text.TextUtils;
+import android.util.Log;
 import android.util.SparseArray;
 import android.view.Gravity;
 import android.view.Menu;
@@ -27,7 +28,10 @@ import com.base.bj.trpayjar.utils.TrPay;
 import com.nightonke.boommenu.BoomButtons.BoomButton;
 import com.nightonke.boommenu.BoomButtons.TextOutsideCircleButton;
 import com.nightonke.boommenu.BoomMenuButton;
-import com.qihoo.appstore.common.updatesdk.lib.UpdateHelper;
+import com.pgyersdk.update.DownloadFileListener;
+import com.pgyersdk.update.PgyUpdateManager;
+import com.pgyersdk.update.UpdateManagerListener;
+import com.pgyersdk.update.javabean.AppBean;
 import com.tencent.smtt.sdk.QbSdk;
 import com.tubb.smrv.SwipeMenuRecyclerView;
 
@@ -387,11 +391,12 @@ abstract class HomeActivity extends BaseActivity implements NavigationView.OnNav
         mMenuIds.put(mMenuIds.size(), menuId);
     }
 
-    private void checkForceUpdateSilent() {
-        UpdateHelper.getInstance().init(getContext(), Color.parseColor("#0A93DB"));
-        UpdateHelper.getInstance().setDebugMode(false);
-        long intervalMillis = 0 * 1000L;
-        UpdateHelper.getInstance().autoUpdate(getPackageName(), false, intervalMillis);
+    public void checkForceUpdateSilent() {
+        new PgyUpdateManager.Builder()
+                .setForced(false)                //设置是否强制更新
+                .setUserCanRetry(false)         //失败后是否提示重新下载
+                .setDeleteHistroyApk(true)     // 检查更新前是否删除本地历史 Apk
+                .register();
     }
 
     public void AnimationShake() {

mobile/src/main/java/cn/garymb/ygomobile/ui/preference/fragments/SettingFragment.java

@@ -23,7 +23,11 @@ import android.widget.Toast;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.signature.StringSignature;
-import com.qihoo.appstore.common.updatesdk.lib.UpdateHelper;
+import com.pgyersdk.update.DownloadFileListener;
+import com.pgyersdk.update.PgyUpdateManager;
+import com.pgyersdk.update.UpdateManagerListener;
+import com.pgyersdk.update.javabean.AppBean;
+
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -178,9 +182,12 @@ public class SettingFragment extends PreferenceFragmentPlus {
                     .show();
         }
         if (PREF_CHECK_UPDATE.equals(preference.getKey())) {
-            UpdateHelper.getInstance().init(getContext(), Color.parseColor("#0A93DB"));
-            UpdateHelper.getInstance().setDebugMode(false);
-            UpdateHelper.getInstance().manualUpdate("cn.garymb.ygomobile");
+             new PgyUpdateManager
+                    .Builder()
+                    .setForced(true)                //设置是否强制更新,非自定义回调更新接口此方法有用
+                    .setUserCanRetry(true)         //失败后是否提示重新下载，非自定义下载 apk 回调此方法有用
+                    .setDeleteHistroyApk(true)     // 检查更新前是否删除本地历史 Apk， 默认为true
+                    .register();
 
         }
         if (PREF_PENDULUM_SCALE.equals(key)) {

mobile/src/main/res/xml/update_apk_path.xml

-<?xml version="1.0" encoding="utf-8"?>
-<paths xmlns:android="http://schemas.android.com/apk/res/android">
-    <cache-path name="qihoo_update" path="360Download/"/>
-</paths>
\ No newline at end of file