修改上线第一版本的bug

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

@@ -74,6 +74,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.receiver.UpdateAppReceiver;
 import com.rv.version.util.DownloadAppUtils;
 import com.rv.version.util.UpdateAppUtils;
 import com.xxfc.discovery.DiscoveryFragment;
@@ -189,6 +190,7 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements EasyP
         viewPager.setOffscreenPageLimit(5);
         setCurrent(TYPE_HOME_PAGE);
         registerNetWorkListener();
+        registerUpdate();
         initNotification();
         SwitchFragment.setFragmentSelected(postion -> setCurrent(postion));
 
@@ -206,6 +208,25 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements EasyP
         }
     }
 
+
+    private UpdateAppReceiver updateAppReceiver = null;
+
+    private void registerUpdate() {
+        if (updateAppReceiver == null) {
+            updateAppReceiver = new UpdateAppReceiver();
+        }
+        IntentFilter filter = new IntentFilter();
+        filter.addAction("teprinciple.update");
+        registerReceiver(updateAppReceiver, filter);
+    }
+
+    public void unRegisterUpdateReceiver() {
+        if (updateAppReceiver != null) {
+            unregisterReceiver(updateAppReceiver);
+            updateAppReceiver = null;
+        }
+    }
+
     private void initNotification() {
         BasicPushNotificationBuilder builder = new BasicPushNotificationBuilder(mActivity);
         builder.statusBarDrawable = R.drawable.logo_title;
@@ -567,7 +588,7 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements EasyP
                 mPresenter.postData(RvFrameConfig.HOST, 10000, ApiConfig.HTTP_URL_RELATION_BIND, null, body, header, false);
             }
 
-            Log.d("type =",""+intent.getIntExtra("type", 0)) ;
+            Log.d("type =", "" + intent.getIntExtra("type", 0));
             switch (intent.getIntExtra("type", 0)) {
                 case 0:
                 case 4:
@@ -613,7 +634,7 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements EasyP
     public void onDestroy() {
         super.onDestroy();
         destory();
-        DownloadAppUtils.unRegisterReceiver(getApplicationContext());
+        unRegisterUpdateReceiver();
         if (netReceiver != null) {
             unregisterReceiver(netReceiver);
             netReceiver = null;
@@ -699,7 +720,7 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements EasyP
                 .setCancelable(false)
                 .setPositiveButton("确定", (dialog1, which) -> {
                     dialog1.dismiss();
-                    System.exit(0);
+                    finish();
                 }).show();
 //        WindowManager.LayoutParams params = dialog.getWindow().getAttributes();
 //        params.type = WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG;

component_utils/src/main/java/com/rv/component/utils/ShareUtils.java

@@ -8,6 +8,7 @@ import android.graphics.Canvas;
 import android.graphics.Color;
 import android.net.Uri;
 import android.view.View;
+import android.widget.ScrollView;
 import android.widget.Toast;
 
 import java.io.BufferedOutputStream;
@@ -45,6 +46,22 @@ public class ShareUtils {
         return bmp;
     }
 
+    public static Bitmap getBitmapByView(ScrollView scrollView) {
+        int h = 0;
+        Bitmap bitmap = null;
+        for (int i = 0; i < scrollView.getChildCount(); i++) {
+            h += scrollView.getChildAt(i).getHeight();
+            scrollView.getChildAt(i).setBackgroundColor(
+                    Color.parseColor("#ffffff"));
+        }
+        bitmap = Bitmap.createBitmap(scrollView.getWidth(), h,
+                Bitmap.Config.ARGB_4444);
+        final Canvas canvas = new Canvas(bitmap);
+        scrollView.draw(canvas);
+        return bitmap;
+    }
+
+
     public static File saveBitmapFile(Context context, Bitmap bitmap) {
         File parent = new File(StorageUtils.getPhotoSavePath(context));
         if (!parent.exists()) {

module_home/src/main/java/com/rv/home/rv/module/basic/BaseLoginActivity.java

@@ -17,6 +17,7 @@ import com.ruiwenliu.wrapper.other.TagAliasOperatorHelper;
 import com.ruiwenliu.wrapper.presenter.MvpPresenter;
 import com.ruiwenliu.wrapper.util.UtilsManager;
 import com.ruiwenliu.wrapper.weight.TitleView;
+import com.rv.component.utils.AppCookie;
 import com.rv.component.utils.Cookie;
 import com.rv.component.utils.DateUtils;
 import com.rv.component.utils.LogUtil;
@@ -128,6 +129,7 @@ public abstract class BaseLoginActivity<P extends MvpPresenter> extends BaseStat
         if (isQQ == 0) {
             map.put("unionid", uid);
         }
+        map.put("code", AppCookie.getStringValue(getApplicationContext(), "code"));
         mPresenter.postData(2, ApiConfig.HTTP_URL_OTHER_LOGIN_BIND, RegisteredBean.class, map, true);
     }
 

plugin_im/src/main/java/com/rv/im/xmpp/XChatManager.java

@@ -45,9 +45,11 @@ public class XChatManager {
         mService = coreService;
         mConnection = connection;
         mLoginUserId = mService.getUserId();
-        mServerName = ((AppConfig) RvCache.getInstance().get(CacheEnum.IM_CONFIG)).XMPPDomain;
-
-        initXChat();
+        AppConfig appConfig = ((AppConfig) RvCache.getInstance().get(CacheEnum.IM_CONFIG));
+        if (appConfig != null) {
+            mServerName = appConfig.XMPPDomain;
+            initXChat();
+        }
     }
 
     private void initXChat() {

plugin_share/src/main/java/com/rv/share/ReativeBillActivity.java

@@ -17,6 +17,7 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -61,6 +62,8 @@ public class ReativeBillActivity extends BaseStatusActivity<ReativeBillPresenter
     CardView llBillContent;
     @BindView(R2.id.img_bill_top)
     ImageView imgBillTop;
+    @BindView(R2.id.scrollView)
+    ScrollView scrollView ;
 //    @BindView(R2.id.ll_content)
 //    LinearLayout llContent;
 
@@ -131,17 +134,17 @@ public class ReativeBillActivity extends BaseStatusActivity<ReativeBillPresenter
     private void preShare(int type, int requestCode) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
             if (type == 0) {
-                mPresenter.saveBill(llBillContent);
+                mPresenter.saveBill(scrollView);
             } else {
-                mPresenter.share(llBillContent);
+                mPresenter.share(scrollView);
             }
         } else {
             if (ContextCompat.checkSelfPermission(this,
                     Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
                 if (type == 0) {
-                    mPresenter.saveBill(llBillContent);
+                    mPresenter.saveBill(scrollView);
                 } else {
-                    mPresenter.share(llBillContent);
+                    mPresenter.share(scrollView);
                 }
             } else {//申请权限
                 ActivityCompat.requestPermissions(this,
@@ -156,14 +159,14 @@ public class ReativeBillActivity extends BaseStatusActivity<ReativeBillPresenter
         switch (requestCode) {
             case 1001:
                 if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                    mPresenter.saveBill(llBillContent);
+                    mPresenter.saveBill(scrollView);
                 } else {
                     Toast.makeText(getApplicationContext(), "授权失败,无法分享海报", Toast.LENGTH_SHORT).show();
                 }
                 break;
             case 1002:
                 if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                    mPresenter.share(llBillContent);
+                    mPresenter.share(scrollView);
                 } else {
                     Toast.makeText(getApplicationContext(), "授权失败,无法分享海报", Toast.LENGTH_SHORT).show();
                 }

plugin_share/src/main/java/com/rv/share/presenter/ReativeBillPresenter.java

@@ -3,6 +3,7 @@ package com.rv.share.presenter;
 import android.app.Activity;
 import android.graphics.Bitmap;
 import android.view.View;
+import android.widget.ScrollView;
 import android.widget.Toast;
 
 import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
@@ -18,7 +19,7 @@ public class ReativeBillPresenter extends CommonPresenter {
 
     private ShareChoiceDialog dialog = null;
     private ShareAction shareAction = null;
-    private View view = null;
+    private ScrollView view = null;
     private Bitmap bitmap = null;
     private UMImage image = null;
 
@@ -26,9 +27,9 @@ public class ReativeBillPresenter extends CommonPresenter {
      * 保存海报
      * @param view
      */
-    public void saveBill(View view) {
+    public void saveBill(ScrollView view) {
         if (view != null) {
-            Bitmap bitmap = ShareUtils.viewConversionBitmap(view);
+            Bitmap bitmap = ShareUtils.getBitmapByView(view);
             File file = null;
             if (bitmap != null) {
                 file = ShareUtils.saveBitmapFile(getPresenterContext(), bitmap);
@@ -43,7 +44,7 @@ public class ReativeBillPresenter extends CommonPresenter {
     /******
      * 分享
      */
-    public void share(View view) {
+    public void share(ScrollView view) {
         this.view = view;
         if (dialog == null) {
             dialog = new ShareChoiceDialog.Builder(getPresenterContext())
@@ -75,7 +76,7 @@ public class ReativeBillPresenter extends CommonPresenter {
 
         private void shareDeal() {
             if (view != null && bitmap == null) {
-                bitmap = ShareUtils.viewConversionBitmap(view);
+                bitmap = ShareUtils.getBitmapByView(view);
             }
             File file = null;
             if (bitmap != null) {

plugin_share/src/main/res/layout/activity_reative_bill.xml

@@ -40,6 +40,7 @@
             app:cardCornerRadius="5dp">
 
             <ScrollView
+                android:id="@+id/scrollView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/size_10"

plugin_share/src/main/res/layout/activity_share_ruler.xml

@@ -23,7 +23,6 @@
                 android:src="@drawable/banner_share_ruler_top" />
 
             <TextView
-                android:visibility="gone"
                 android:layout_width="@dimen/size_80"
                 android:layout_height="@dimen/size_30"
                 android:layout_marginLeft="@dimen/size_10"
@@ -32,10 +31,10 @@
                 android:gravity="center"
                 android:text="活动时间"
                 android:textColor="@color/white"
-                android:textSize="@dimen/sp_16" />
+                android:textSize="@dimen/sp_16"
+                android:visibility="gone" />
 
             <TextView
-                android:visibility="gone"
                 android:id="@+id/tv_ac_time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -43,7 +42,8 @@
                 android:layout_marginTop="@dimen/size_10"
                 android:text="2019-06-25 10:00~2019-06-25 10:00"
                 android:textColor="#666666"
-                android:textSize="@dimen/sp_14" />
+                android:textSize="@dimen/sp_14"
+                android:visibility="gone" />
 
             <TextView
                 android:layout_width="@dimen/size_80"
@@ -62,7 +62,7 @@
                 android:layout_marginLeft="@dimen/size_10"
                 android:layout_marginTop="@dimen/size_10"
                 android:layout_marginRight="@dimen/size_10"
-                android:text="         分享你的邀请码或专属链接给您的好友，邀请好友下载并进入【滴房车】APP完成注册。每当您的1位好友完成1次租车或房车游行程或购买会员并支付订单，您即可获得好友支付订单金额（不包括租车押金）的3%提成作为邀请奖励。您邀请下单的好友越多，您获得的奖励越多，奖励现金可提现。"
+                android:text="         分享你的邀请码或专属链接给您的好友，邀请好友下载并进入【滴房车】APP完成注册。每当您的1位好友完成1次租车或房车游行程或购买会员并支付订单，您即可获得好友支付订单金额（不包括租车押金）的5%提成作为邀请奖励。您邀请下单的好友越多，您获得的奖励越多，奖励现金可提现。"
                 android:textColor="#ff666666"
                 android:textSize="@dimen/sp_14" />
 
@@ -185,7 +185,7 @@
                     android:layout_marginRight="@dimen/size_50"
                     android:background="@drawable/bg_income_item"
                     android:gravity="center"
-                    android:text="您获得邀请奖励：订单3%的提成" />
+                    android:text="您获得邀请奖励：订单5%的提成" />
 
             </LinearLayout>
 
@@ -234,16 +234,17 @@
                 android:orientation="horizontal">
 
                 <ImageView
-                    android:layout_width="@dimen/size_50"
-                    android:layout_height="@dimen/size_50"
-                    android:src="@mipmap/logo" />
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/icon_ruler_logo" />
 
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginLeft="5dp"
                     android:gravity="center_vertical|left"
-                    android:orientation="vertical">
+                    android:orientation="vertical"
+                    android:visibility="gone">
 
                     <TextView
                         android:layout_width="wrap_content"

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

@@ -50,8 +50,6 @@ 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

@@ -19,27 +19,8 @@ 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) {
 
-        registerReceiver(context);
         String rootPath = null;
         rootPath = getCachePath(context) + File.separator + Environment.DIRECTORY_DOWNLOADS + File.separator;
         send(context, -1, serverVersionName);