邀请商家

app/src/main/java/com/dayu/bigfish/ui/MainActivity.java

@@ -91,7 +91,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
     private HomeOrderFragment secondFragment;
     private HomeLearnFragment learnFragment;
     private HomeUserFragment fourFragment;
-    private int mFirstPositon = 0;
+    private int mFirstPositon = 2;
     private BadgeView mBadgeView;
     private BadgeView mOrderBadgeView;
     private BadgeView mSaleBadgeView;
@@ -118,8 +118,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
         secondFragment = HomeOrderFragment.newInstance();
         learnFragment = new HomeLearnFragment();
         fourFragment = HomeUserFragment.newInstance();
-            mFragments = new Fragment[]{saleFragment, secondFragment, learnFragment,fourFragment};
-            mFirstPositon = 0;
+        mFragments = new Fragment[]{saleFragment, secondFragment, learnFragment,fourFragment};
         mTabs = new TextView[]{mBind.tabSale, mBind.tabSecond,mBind.tabLearn, mBind.tabFour};
         addFragment();
         initListener();

baseSDK/src/main/java/com/dayu/common/Constants.java

@@ -31,6 +31,8 @@ public class Constants {
 
     public static final String PROGRAM_PATH = "pages/mallDetail/main?goodsId=gid&userId=uid&type=1"; //小程序路径
     public static final String INVITE_NEW_SHARE_URL = "http://app.dl.kf.ai/ext/#/shareMaster?code="; //邀请新人分享链接
+    public static final String INVITE_NEW_SHARE_URL_BUSINESS = "http://app.dl.kf.ai/ext/#/merchants?code="; //邀请商家分享链接
+
 
     /**
      * dev环境配置.

baseSDK/src/main/res/layout/activity_camera.xml

@@ -9,7 +9,7 @@
         android:id="@+id/jcameraview"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:duration_max="180000"
+        app:duration_max="300000"
         app:iconLeft="@drawable/ic_back"
         app:iconMargin="20dp"
         app:iconRight="@null"

baseSDK/src/main/res/values/colors.xml

@@ -41,6 +41,8 @@
     <color name="common_text_color">#3a3a3a</color>
     <color name="editext_color">#FFB6B6B6</color>
     <color name="view_color">#E6E6E6 </color>
+    <color name="dark_red">#a30014</color>
+
 
 
     <color name="blue_register">#FF0e15fb</color>

baseSDK/src/main/res/values/dimens.xml

@@ -119,6 +119,8 @@
     <dimen name="dp_23">23dp</dimen>
 
     <dimen name="dp_sale_step">1dp</dimen>
+    <dimen name="common_btn_radius">5dp</dimen>
+
 
 
 </resources>
\ No newline at end of file

learnCenter/src/main/java/com/dayu/learncenter/ui/activity/PubCourseActivity.java

@@ -105,7 +105,7 @@ public class PubCourseActivity extends BaseActivity<PubCoursePresenter, Activity
             if (pos == 0) {
                 recordVideo();
             } else {
-                MediaChooseUtils.chooseSigleVideo(this, 181);
+                MediaChooseUtils.chooseSigleVideo(this, 301);
             }
         });
     }

userCenter/src/main/java/com/dayu/usercenter/presenter/homeuser/HomeUserPresenter.java

@@ -99,6 +99,14 @@ public class HomeUserPresenter extends HomeUserContract.Presenter {
     public void dumpToInvate() {
         Bundle bundle  = new Bundle();
         bundle.putString(Constants.INVITE_CODE,mInviteCode);
+        bundle.putInt(Constants.TYPE,2);
+        mView.startActivity(InvateNewActivity.class,bundle);
+    }
+
+    public void invateProvider() {
+        Bundle bundle  = new Bundle();
+        bundle.putString(Constants.INVITE_CODE,mInviteCode);
+        bundle.putInt(Constants.TYPE,1);
         mView.startActivity(InvateNewActivity.class,bundle);
     }
 

userCenter/src/main/java/com/dayu/usercenter/ui/activity2/InvateNewActivity.java

@@ -20,6 +20,8 @@ import com.umeng.socialize.bean.SHARE_MEDIA;
  */
 public class InvateNewActivity extends BaseActivity<SImplePresenter, ActivityInvateNewBinding> {
     private String mInviteCode;
+    private int mType; // 1.邀请商家 2.邀请师傅
+
 
     @Override
     public void setPresenter() {
@@ -35,6 +37,14 @@ public class InvateNewActivity extends BaseActivity<SImplePresenter, ActivityInv
     public void initView() {
         initUser();
         mInviteCode = getBundle().getString(Constants.INVITE_CODE);
+        mType = getBundle().getInt(Constants.TYPE);
+        if (mType == 1) {
+            mBind.tvForward.setBackgroundResource(R.drawable.btn_dark_red);
+            mBind.tvForward.setText(R.string.forward_provider_now);
+            mBind.tvTitle.setText(R.string.invate_provider_title);
+            mBind.tvRule1.setText(R.string.invate_provider_rule1);
+            mBind.tvRule2.setText(R.string.invate_provider_rule2);
+        }
         if (TextUtils.isEmpty(mInviteCode)) {
             getCode();
         } else {
@@ -47,9 +57,10 @@ public class InvateNewActivity extends BaseActivity<SImplePresenter, ActivityInv
     //分享按钮点击事件
     private void setListener() {
         mBind.tvForward.setOnClickListener(v -> {
-            String url = Constants.INVITE_NEW_SHARE_URL + mInviteCode;
-            CommonUtils.shareWxUrl(this, url, Constants.AppLogoUrl, getString(R.string.invite_new_share_title),
-                    getString(R.string.invite_new_share_content), new UMShareListener() {
+            String url = mType == 2 ? Constants.INVITE_NEW_SHARE_URL : Constants.INVITE_NEW_SHARE_URL_BUSINESS;
+            String title = getString(R.string.invite_new_share_title);
+            String desc = getString(mType == 2 ? R.string.invite_new_share_content : R.string.invite_new_share_content_business);
+            CommonUtils.shareWxUrl(this, url + mInviteCode, "", title, desc, new UMShareListener() {
                 @Override
                 public void onStart(SHARE_MEDIA share_media) {
                 }
@@ -57,7 +68,7 @@ public class InvateNewActivity extends BaseActivity<SImplePresenter, ActivityInv
                 @Override
                 public void onResult(SHARE_MEDIA share_media) {
                     if (share_media == SHARE_MEDIA.WEIXIN_CIRCLE) {
-                        ToastUtils.showShortToast(R.string.share_finish);
+                        showToast(R.string.share_finish);
                     }
                 }
 

userCenter/src/main/res/drawable/btn_dark_red.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners android:radius="@dimen/common_btn_radius"/>
+    <solid android:color="@color/dark_red"/>
+</shape>
\ No newline at end of file

userCenter/src/main/res/layout/activity_invate_new.xml

@@ -43,12 +43,14 @@
                         android:text="@string/invate_reward_rule"
                         />
                     <TextView
+                        android:id="@+id/tv_rule1"
                         style="@style/common_text_style"
                         android:text="@string/invate_reward_rule1"
                         android:layout_marginTop="5dp"
                         android:textColor="#666"
                         />
                     <TextView
+                        android:id="@+id/tv_rule2"
                         style="@style/common_text_style"
                         android:text="@string/invate_reward_rule2"
                         android:layout_marginTop="5dp"

userCenter/src/main/res/layout/fragment_home_user.xml

@@ -388,6 +388,19 @@
                         android:layout_margin="15dp"
                         android:onClick="@{()->presenter.dumpToInvate()}"
                         />
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="49dp"
+                        android:gravity="center"
+                        android:text="@string/invate_provider_title"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/sp_16"
+                        android:background="@drawable/btn_dark_red"
+                        android:layout_marginLeft="15dp"
+                        android:layout_marginRight="15dp"
+                        android:layout_marginBottom="15dp"
+                        android:onClick="@{()->presenter.invateProvider()}"
+                        />
                 </LinearLayout>
             </android.support.v4.widget.NestedScrollView>
         </com.scwang.smartrefresh.layout.SmartRefreshLayout>

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

@@ -32,14 +32,20 @@
     <string name="sale_record_rule4_1_2">的佣金。（佣金含依法代扣代缴个人劳务收入所得税费和支付手续费等）</string>
     <string name="sale_record_rule4_2">的佣金，对于[消费返利]平台收取每笔返利金额</string>
     <string name="sale_record_rule4_3">的佣金。（佣金含依法代扣代缴个人劳务收入所得税费和支付手续费等）</string>
+    <string name="invate_user_title">邀请新人有奖</string>
     <string name="invate_reward_rule">奖励规则:</string>
     <string name="invate_reward_rule1">1、成功邀请一名新人注册大鱼师傅APP, 被邀请人的销售奖励/服务收入的5%给您。</string>
     <string name="invate_reward_rule2">2、请务必提醒被邀请人在注册APP时准确输入您的【专属邀请码】；如果输入错误或忘记输入，系统无法识别并记账。</string>
     <string name="remember_your_invate_code">请牢记您的专属邀请码：</string>
     <string name="forward_invate_now">马上转发\n【大鱼师傅APP】注册链接</string>
+    <string name="invate_provider_title">推荐商家有奖</string>
+    <string name="invate_provider_rule1">1、推荐成功注册大鱼商家，该商家前十单销售奖励/服务工费的10%都归您。</string>
+    <string name="invate_provider_rule2">2、请务必提醒商家注册时准确输入您的【专属邀请码】；如果输入错误或忘记输入，系统无法识别并记账。</string>
+    <string name="forward_provider_now">马上转发\n【大鱼商家APP】注册链接</string>
     <string name="share_finish">分享结束</string>
     <string name="invite_new_share_title">大鱼师傅</string>
     <string name="invite_new_share_content">邀请师傅瓜分千万佣金！</string>
+    <string name="invite_new_share_content_business">邀请商家瓜分千万佣金！</string>
     <string name="add_service_wechat">添加客服微信获得更多派单</string>
     <string name="copy_wechat_num">复制微信号</string>
 </resources>