Merge branch 'dev-member-john' of http://113.105.137.151:22280/lify/rvapp

RvClient/src/dev/res/values/strings.xml

 <resources>
     <string name="app_name">滴房车(开发)</string>
+	<string name="share_install_key">7RBK2KEE66HKB6</string>
+	<string name="share_install_scheme">cqdp9905</string>
 </resources>

RvClient/src/main/AndroidManifest.xml

@@ -125,7 +125,7 @@
 
         <meta-data
             android:name="com.shareinstall.APP_KEY"
-            android:value="B7BK2A6722BAH6" />
+            android:value="@string/share_install_key" />
         <meta-data
             android:name="com.baidu.lbsapi.API_KEY"
             android:value="QaN98C5rV8hawNLVix0FAPLSsz7uh2q1" /> <!-- <meta-data -->
@@ -372,7 +372,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="pdfd6612" />
+                <data android:scheme="@string/share_install_scheme" />
             </intent-filter>
         </activity>
         <activity android:name=".GuideActivity"></activity>

RvClient/src/main/java/com/xxfc/rv/MainActivity.java

@@ -39,6 +39,7 @@ import com.rv.share.view.PromotionDialog;
 import com.rv.tourism.R2;
 import com.rv.tourism.TourismFragment;
 import com.rv.version.bean.VersionCheckBean;
+import com.rv.version.util.DownloadAppUtils;
 import com.rv.version.util.UpdateAppUtils;
 import com.xxfc.discovery.DiscoveryFragment;
 import com.yuyife.okgo.OkGoUtil;
@@ -114,12 +115,7 @@ public class MainActivity extends BaseActivity<CommonPresenter> {
         viewPager.setOffscreenPageLimit(5);
         setCurrent(TYPE_HOME_PAGE);
 
-        SwitchFragment.setFragmentSelected(new SwitchFragment.ChangeFragment() {
-            @Override
-            public void changge(int postion) {
-                setCurrent(postion);
-            }
-        });
+        SwitchFragment.setFragmentSelected(postion -> setCurrent(postion));
     }
 
     @Override
@@ -363,4 +359,10 @@ public class MainActivity extends BaseActivity<CommonPresenter> {
             startActivity(in);
         }
     }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        DownloadAppUtils.unRegisterReceiver(getApplicationContext());
+    }
 }

RvClient/src/main/java/com/xxfc/rv/RvClientApplication.java

@@ -56,7 +56,7 @@ public class RvClientApplication extends FrameApp {
             ShareInstall.getInstance().init(this);
             ShareInstall.getInstance().reportRegister();
         }
-        LogUtil.setLogEnable(BuildConfig.DEBUG, getApplicationContext());
+        LogUtil.setLogEnable(true, getApplicationContext());
         if (BuildConfig.DEBUG)
             CrashHandler.getInstance().init(getApplicationContext());
         // 在使用 SDK 各组间之前初始化 context 信息，传入 ApplicationContext

RvClient/src/main/res/values/strings.xml

-<resources></resources>

RvClient/src/pro/res/values/strings.xml

 <resources>
     <string name="app_name">滴房车</string>
+	<string name="share_install_key">B7BK2A6722BAH6</string>
+	<string name="share_install_scheme">pdfd6612</string>
 </resources>

RvClient/src/sit/res/values/strings.xml

 <resources>
     <string name="app_name">滴房车(测试)</string>
+	<string name="share_install_key">FFBK2KEE6RK6EF</string>
+	<string name="share_install_scheme">dkkg9859</string>
 </resources>

plugin_version/src/main/java/com/rv/version/VersionUpdateDialog.java

@@ -2,6 +2,8 @@ package com.rv.version;
 
 import android.app.Dialog;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.support.annotation.NonNull;
 import android.text.Html;
 import android.text.TextUtils;
@@ -16,6 +18,7 @@ import android.widget.TextView;
 
 import com.ruiwenliu.wrapper.dialog.BaseDialog;
 import com.rv.version.bean.UpdateBean;
+import com.rv.version.receiver.UpdateAppReceiver;
 
 public class VersionUpdateDialog  extends BaseDialog {
 

plugin_version/src/main/java/com/rv/version/receiver/UpdateAppReceiver.java

@@ -50,6 +50,8 @@ public class UpdateAppReceiver extends BroadcastReceiver {
      * 下载完成后的逻辑
      */
     private void handleDownloadComplete(Context context, int notifyId, NotificationManager nm) {
+
+        DownloadAppUtils.unRegisterReceiver(context);
         // 关闭通知栏
         if (nm != null) {
             nm.cancel(notifyId);

plugin_version/src/main/java/com/rv/version/util/DownloadAppUtils.java

@@ -2,14 +2,15 @@ package com.rv.version.util;
 
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.os.Environment;
 import android.util.Log;
 import android.widget.Toast;
 
-
 import com.liulishuo.filedownloader.BaseDownloadTask;
 import com.liulishuo.filedownloader.FileDownloadLargeFileListener;
 import com.liulishuo.filedownloader.FileDownloader;
+import com.rv.version.receiver.UpdateAppReceiver;
 
 import java.io.File;
 
@@ -18,10 +19,27 @@ public class DownloadAppUtils {
     private static final String TAG = DownloadAppUtils.class.getSimpleName();
     public static String downloadUpdateApkFilePath;//下载更新Apk 文件路径
 
+    private static UpdateAppReceiver updateAppReceiver = null;
+
+    private static void registerReceiver(Context mContext) {
+        if (updateAppReceiver == null) {
+            updateAppReceiver = new UpdateAppReceiver();
+        }
+        IntentFilter filter = new IntentFilter();
+        filter.addAction("teprinciple.update");
+        mContext.registerReceiver(updateAppReceiver, filter);
+    }
+
+    public static void unRegisterReceiver(Context context) {
+        if (updateAppReceiver != null) {
+            context.unregisterReceiver(updateAppReceiver);
+            updateAppReceiver = null;
+        }
+    }
 
     public static void download(final Context context, String url, final String serverVersionName) {
 
-        String packageName = context.getPackageName();
+        registerReceiver(context);
         String rootPath = null;
         rootPath = getCachePath(context) + File.separator + Environment.DIRECTORY_DOWNLOADS + File.separator;
         send(context, -1, serverVersionName);

plugin_version/src/main/java/com/rv/version/util/UpdateAppUtils.java

@@ -3,7 +3,6 @@ package com.rv.version.util;
 import android.Manifest;
 import android.app.Activity;
 import android.content.Context;
-import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;