Commit eefe9dea by mReturn

工单优化,邀请奖励

parent 5fb96c68
Showing with 470 additions and 80 deletions
...@@ -2,13 +2,15 @@ ...@@ -2,13 +2,15 @@
<!-- <!--
Base application theme, dependent on API level. This theme is replaced Base application theme, dependent on API level. This theme is replaced
by AppBaseTheme from res/values-vXX/styles.xml on newer devices. by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
--> -->
<style name="AppBaseTheme" parent="android:Theme.Holo.Light.NoActionBar.Fullscreen"> <style name="AppBaseTheme" parent="android:Theme.Holo.Light.NoActionBar.Fullscreen">
<!-- <!--
Theme customizations available in newer API levels can go in Theme customizations available in newer API levels can go in
res/values-vXX/styles.xml, while customizations related to res/values-vXX/styles.xml, while customizations related to
backward-compatibility can go here. backward-compatibility can go here.
--> -->
</style> </style>
......
...@@ -152,6 +152,12 @@ ...@@ -152,6 +152,12 @@
<activity <activity
android:name="com.dayu.bigfish.wxapi.WXEntryActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:exported="true"
android:theme="@android:style/Theme.Translucent.NoTitleBar" />
<activity
android:name="com.dayu.bigfish.ui.UmengPushNotifyActivity" android:name="com.dayu.bigfish.ui.UmengPushNotifyActivity"
android:launchMode="singleTask" android:launchMode="singleTask"
android:exported="true" /> android:exported="true" />
......
...@@ -19,6 +19,7 @@ import android.view.KeyEvent; ...@@ -19,6 +19,7 @@ import android.view.KeyEvent;
import android.widget.TextView; import android.widget.TextView;
import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter;
import com.bigfish.salecenter.event.SaleTabNumEvent; import com.bigfish.salecenter.event.SaleTabNumEvent;
import com.bigfish.salecenter.ui.fragment.HomeSaleFragment; import com.bigfish.salecenter.ui.fragment.HomeSaleFragment;
import com.dayu.base.api.Api; import com.dayu.base.api.Api;
...@@ -65,6 +66,7 @@ import com.dayu.widgets.BadgeView; ...@@ -65,6 +66,7 @@ import com.dayu.widgets.BadgeView;
import com.dayu.widgets.CustomDialog; import com.dayu.widgets.CustomDialog;
import com.dayu.widgets.listener.onDownloadListener; import com.dayu.widgets.listener.onDownloadListener;
import com.umeng.analytics.MobclickAgent; import com.umeng.analytics.MobclickAgent;
import com.umeng.socialize.UMShareAPI;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.Subscribe;
...@@ -166,10 +168,33 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin ...@@ -166,10 +168,33 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
// }); // });
// mBind.tabFour.setOnClickListener(o -> showHideFragment(3, mPosition)); // mBind.tabFour.setOnClickListener(o -> showHideFragment(3, mPosition));
mBind.tabSale.setOnClickListener(o -> showHideFragment(0, mPosition)); mBind.tabSale.setOnClickListener(o -> showHideFragment(0, mPosition));
mBind.tabSecond.setOnClickListener(o -> showHideFragment(1, mPosition)); mBind.tabSecond.setOnClickListener(o -> {
showHideFragment(1, mPosition);
int detectSatus = UserManager.getInstance().getUser().getDetectStatus();
if (detectSatus == 2 || detectSatus == 3) {
showCertificationDialog();
}
});
mBind.tabFour.setOnClickListener(o -> showHideFragment(2, mPosition)); mBind.tabFour.setOnClickListener(o -> showHideFragment(2, mPosition));
} }
//提示去认证身份
private void showCertificationDialog() {
CustomDialog customDialog = new CustomDialog(mActivity, com.dayu.order.R.style.CustomDialog, getString(com.dayu.order.R.string.engineer_identity_not_audite)
, (dialog, confirm) -> {
if (confirm) {
Bundle bundle = new Bundle();
bundle.putInt(Constants.CETIFICATION_STATE, 1);
ARouter.getInstance().build(RouterPath.PATH_CERTIFICAITON).withBundle(Constants.BUNDLE, bundle).navigation();
}
});
customDialog.setTitle(getString(com.dayu.order.R.string.certification))
.setPositiveButton(getString(com.dayu.order.R.string.go_certification))
.setNegativeButton(getString(com.dayu.order.R.string.cancle));
customDialog.show();
}
/** /**
* 添加fragment. * 添加fragment.
*/ */
...@@ -477,4 +502,10 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin ...@@ -477,4 +502,10 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
notificationManager.cancel(0); notificationManager.cancel(0);
} }
} }
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
UMShareAPI.get(this).onActivityResult(requestCode,resultCode,data);
}
} }
package com.dayu.wxapi; package com.dayu.bigfish.wxapi;
import com.umeng.socialize.weixin.view.WXCallbackActivity; import com.umeng.socialize.weixin.view.WXCallbackActivity;
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
<TextView style="@style/line" /> <TextView style="@style/line" />
<RelativeLayout <RelativeLayout
android:visibility="gone"
android:id="@+id/set_message" android:id="@+id/set_message"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="54dp" android:layout_height="54dp"
......
...@@ -17,10 +17,6 @@ ...@@ -17,10 +17,6 @@
<activity android:name="com.dayu.base.ui.activity.PreviewActivty" /> <activity android:name="com.dayu.base.ui.activity.PreviewActivty" />
<activity android:name="com.dayu.base.ui.activity.ImgGalleryActivty" <activity android:name="com.dayu.base.ui.activity.ImgGalleryActivty"
android:screenOrientation="portrait"/> android:screenOrientation="portrait"/>
<activity
android:name="com.dayu.wxapi.WXEntryActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:exported="true"
android:theme="@android:style/Theme.Translucent.NoTitleBar" />
</application> </application>
</manifest> </manifest>
package com.dayu.base.api; package com.dayu.base.api;
import android.text.TextUtils;
import com.dayu.baselibrary.R; import com.dayu.baselibrary.R;
import com.dayu.common.BaseApplication; import com.dayu.common.BaseApplication;
import com.dayu.common.Constants; import com.dayu.common.Constants;
...@@ -22,7 +24,8 @@ public class ServerException extends Exception { ...@@ -22,7 +24,8 @@ public class ServerException extends Exception {
private void processCode(String code) { private void processCode(String code) {
if (code == null) { if (code == null) {
message = BaseApplication.getContext().getString(R.string.get_info_failed); if (TextUtils.isEmpty(message))
message = BaseApplication.getContext().getString(R.string.get_info_failed);
return; return;
} }
switch (code) { switch (code) {
...@@ -31,9 +34,9 @@ public class ServerException extends Exception { ...@@ -31,9 +34,9 @@ public class ServerException extends Exception {
case "ORDER0001": case "ORDER0001":
message = BaseApplication.getContext().getString(R.string.order_not_exite); message = BaseApplication.getContext().getString(R.string.order_not_exite);
break; break;
case "ORDER0002": // case "ORDER0002":
message = BaseApplication.getContext().getString(R.string.order_receive_already); // message = BaseApplication.getContext().getString(R.string.order_receive_already);
break; // break;
case "ORDER0003": case "ORDER0003":
message = BaseApplication.getContext().getString(R.string.order_cancle_not_receive); message = BaseApplication.getContext().getString(R.string.order_cancle_not_receive);
break; break;
......
...@@ -30,6 +30,7 @@ public class Constants { ...@@ -30,6 +30,7 @@ public class Constants {
public static final String PROGRAM_PATH = "pages/mallDetail/main?goodsId=gid&userId=uid&type=1"; //小程序路径 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="; //邀请新人分享链接
/** /**
* 测试环境配置. * 测试环境配置.
...@@ -138,6 +139,9 @@ public class Constants { ...@@ -138,6 +139,9 @@ public class Constants {
public final static String COMMITE_LOCAITON = " /api-user/" + "/engineerPathParticle"; public final static String COMMITE_LOCAITON = " /api-user/" + "/engineerPathParticle";
public final static String AppLogoUrl = " https://dayuoss.oss-cn-beijing.aliyuncs.com/saas/151508298725_.pic_hd.jpg";
/***********************其他配置**********************************/ /***********************其他配置**********************************/
public final static int PAGESIZE = 20; public final static int PAGESIZE = 20;
public final static int NOT_LOGIN = -1; public final static int NOT_LOGIN = -1;
...@@ -194,6 +198,8 @@ public class Constants { ...@@ -194,6 +198,8 @@ public class Constants {
public final static int CANCLE_ORDER = 6; public final static int CANCLE_ORDER = 6;
public final static int FINISH_ORDER = 5; public final static int FINISH_ORDER = 5;
public static int serveOrderId = -1; //开始服务的订单id
//设置通知提醒按钮状态 //设置通知提醒按钮状态
public final static String MESSAGE_STATE = "message_state"; public final static String MESSAGE_STATE = "message_state";
/** /**
...@@ -220,6 +226,7 @@ public class Constants { ...@@ -220,6 +226,7 @@ public class Constants {
public static final String HX_STATE = "hx_state"; public static final String HX_STATE = "hx_state";
public static final String STATE = "state"; public static final String STATE = "state";
public static final String INVITE_CODE = "invite_code";
public static final String CETIFICATION_STATE = "cetificaiton_state";//1:接单跳转、待预约 0:登录页,个人中心跳转 public static final String CETIFICATION_STATE = "cetificaiton_state";//1:接单跳转、待预约 0:登录页,个人中心跳转
......
...@@ -39,6 +39,5 @@ public class AppUtils { ...@@ -39,6 +39,5 @@ public class AppUtils {
return BaseApplication.getContext().getString(R.string.error_verison_code); return BaseApplication.getContext().getString(R.string.error_verison_code);
} }
} }
} }
...@@ -198,17 +198,20 @@ public class CommonUtils { ...@@ -198,17 +198,20 @@ public class CommonUtils {
/** /**
* 分享链接(包含标题内容) * 微信(朋友圈)分享链接(包含标题内容)
*/ */
public static void shareUrl(Activity activity, String url, String imgUrl, String title, public static void shareWxUrl(Activity activity, String url, String imgUrl, String title,
String description, SHARE_MEDIA platform, UMShareListener callBack) { String description, UMShareListener callBack) {
UMWeb web = new UMWeb(url); UMWeb web = new UMWeb(url);
web.setTitle(title); web.setTitle(title);
web.setThumb(new UMImage(activity, imgUrl)); web.setThumb(new UMImage(activity, imgUrl));
web.setDescription(description); web.setDescription(description);
new ShareAction(activity).withMedia(web) new ShareAction(activity).withMedia(web)
.setPlatform(platform) .setDisplayList(SHARE_MEDIA.WEIXIN,SHARE_MEDIA.WEIXIN_CIRCLE)
.setCallback(callBack).share(); .setCallback(callBack).open();
// .setPlatform(SHARE_MEDIA.WEIXIN_CIRCLE)
// .setCallback(callBack).share();
} }
......
...@@ -110,4 +110,21 @@ public class UserManager { ...@@ -110,4 +110,21 @@ public class UserManager {
return Constants.NOT_LOGIN; return Constants.NOT_LOGIN;
} }
} }
public void initTestUserInfo() {
if (UserManager.getInstance().getUser() == null){
String json ="{\n" +
"\t\t\"accountId\": \"1441\",\n" +
"\t\t\"accountName\": \"test01\",\n" +
"\t\t\"detectStatus\": \"2\",\n" +
"\t\t\"roles\": [2],\n" +
"\t\t\"siteId\": \"0\",\n" +
"\t\t\"accessToken\": \"e6c4bef902bf417eab9c8f6e3d024701\",\n" +
"\t\t\"headerImg\": \"http://dl.kf.ai/test/sp/mobile/android/business/checkApply/f7b994aaab9bcf6d12e41b525fffbabe.png?x-oss-process=style/pic\",\n" +
"\t\t\"status\": \"1\",\n" +
"\t\t\"token\": \"76e3568699d04ce8b3e495f114332b7b\"\n" +
"\t}";
UserManager.getInstance().saveUserForJson(json);
}
}
} }
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/fl_content"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
</FrameLayout>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.dayu.order"> package="com.dayu.order">
<application <application
...@@ -6,7 +7,9 @@ ...@@ -6,7 +7,9 @@
android:allowBackup="true" android:allowBackup="true"
android:label="@string/app_name" android:label="@string/app_name"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme"
tools:replace="android:allowBackup"
tools:ignore="GoogleAppIndexingWarning">
<activity <activity
android:name=".ui.activity.TestActivity" android:name=".ui.activity.TestActivity"
android:screenOrientation="portrait"> android:screenOrientation="portrait">
...@@ -65,5 +68,42 @@ ...@@ -65,5 +68,42 @@
<activity <activity
android:name=".ui.activity.CheckContentActivity" android:name=".ui.activity.CheckContentActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.ServerInfoActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.ServerListActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.MultipleProcessActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.MultiProcessOrderActivity"
android:hardwareAccelerated="true"
android:screenOrientation="portrait"
android:windowSoftInputMode="stateHidden|adjustResize" />
<activity
android:name=".ui.activity.SignatureActivity"
android:screenOrientation="landscape" />
<activity
android:name=".ui.activity.OrderLivenessActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.CustomScannerActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.EditeDetailActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.SopLocalActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.ApplyAndRefuseActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.ReturnPartActivity"
android:screenOrientation="portrait" />
</application> </application>
</manifest> </manifest>
...@@ -74,11 +74,21 @@ public class OrderDetail implements Serializable { ...@@ -74,11 +74,21 @@ public class OrderDetail implements Serializable {
private List<accessories> accessories; private List<accessories> accessories;
private List<Spu> spus; private List<Spu> spus;
private Integer needEsignature;//1:需要2:不需要. private Integer needEsignature;//1:需要2:不需要.
private Integer needSerialNumPic;//1:需要2:不需要.
private String esignatureImg; private String esignatureImg;
private Integer payStatus;//或null:未支付 2.已支付3.支付成功4.支付失败 private Integer payStatus;//或null:未支付 2.已支付3.支付成功4.支付失败
private String createdProvider; private String createdProvider;
private double price; private double price;
public Integer getNeedSerialNumPic() {
return needSerialNumPic;
}
public void setNeedSerialNumPic(Integer needSerialNumPic) {
this.needSerialNumPic = needSerialNumPic;
}
public String getCreatedProvider() { public String getCreatedProvider() {
return createdProvider; return createdProvider;
} }
......
...@@ -86,11 +86,11 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter ...@@ -86,11 +86,11 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter
ToastUtils.showShortToast(R.string.signature_name); ToastUtils.showShortToast(R.string.signature_name);
return; return;
} }
String totalMoney = mView.getTotalMoney(); // String totalMoney = mView.getTotalMoney();
if ((mView.getPayType() == 1 || mView.getPayType() == 2) && (TextUtils.isEmpty(totalMoney) || Double.parseDouble(totalMoney) == 0.00)) { // if ((mView.getPayType() == 1 || mView.getPayType() == 2) && (TextUtils.isEmpty(totalMoney) || Double.parseDouble(totalMoney) == 0.00)) {
ToastUtils.showShortToast(R.string.input_money); // ToastUtils.showShortToast(R.string.input_money);
return; // return;
} // }
if (mView.getSelectPayer()) { if (mView.getSelectPayer()) {
mView.showNoPayerDialog(); mView.showNoPayerDialog();
} else { } else {
......
...@@ -43,11 +43,11 @@ public class MultiProcessOrderPresenter extends MultiProcessOrderContract.Presen ...@@ -43,11 +43,11 @@ public class MultiProcessOrderPresenter extends MultiProcessOrderContract.Presen
private Spu mSpu; private Spu mSpu;
private ArrayList<String> mImages = new ArrayList<>(); private ArrayList<String> mImages = new ArrayList<>();
private ArrayList<String> mHttpUrl = new ArrayList<>(); private ArrayList<String> mHttpUrl = new ArrayList<>();
// private ArrayList<String> mSnHttpUrl = new ArrayList<>(); // private ArrayList<String> mSnHttpUrl = new ArrayList<>();
public ObservableField<Spu> mDetail = new ObservableField<>(); public ObservableField<Spu> mDetail = new ObservableField<>();
public ObservableField<String> mInfo = new ObservableField<>(); public ObservableField<String> mInfo = new ObservableField<>();
public ObservableField<String> mBrandName = new ObservableField<>(); public ObservableField<String> mBrandName = new ObservableField<>();
// public ObservableField<String> mSn = new ObservableField<>(); // public ObservableField<String> mSn = new ObservableField<>();
public ObservableField<Boolean> mSpuState = new ObservableField<>(); public ObservableField<Boolean> mSpuState = new ObservableField<>();
public ObservableField<Boolean> mIsShowSn = new ObservableField<>(false); public ObservableField<Boolean> mIsShowSn = new ObservableField<>(false);
public ObservableField<Boolean> mIsShowPhone = new ObservableField<>(false); public ObservableField<Boolean> mIsShowPhone = new ObservableField<>(false);
...@@ -79,6 +79,8 @@ public class MultiProcessOrderPresenter extends MultiProcessOrderContract.Presen ...@@ -79,6 +79,8 @@ public class MultiProcessOrderPresenter extends MultiProcessOrderContract.Presen
} else { } else {
mSpuState.set(false); mSpuState.set(false);
} }
if (Constants.serveOrderId>0)
getOrderDetailInfo(Constants.serveOrderId);
getInfo(); getInfo();
// if (mSpu.getStatus() == 2) { // if (mSpu.getStatus() == 2) {
// getInfo(); // getInfo();
...@@ -248,13 +250,30 @@ public class MultiProcessOrderPresenter extends MultiProcessOrderContract.Presen ...@@ -248,13 +250,30 @@ public class MultiProcessOrderPresenter extends MultiProcessOrderContract.Presen
if (spu.getSerialNumPicUrl() != null) { if (spu.getSerialNumPicUrl() != null) {
mView.initSnPic(spu.getSerialNumPicUrl()); mView.initSnPic(spu.getSerialNumPicUrl());
} }
if (spu.getNeedSerialNumPic() != null && spu.getNeedSerialNumPic() == 1) { // if (spu.getNeedSerialNumPic() != null && spu.getNeedSerialNumPic() == 1) {
mIsShowSn.set(true); // mIsShowSn.set(true);
mView.showSnView(true); // mView.showSnView(true);
} // }
})); }));
} }
public void getOrderDetailInfo(int orderId) {
OrderApiFactory.getOrderInfo(orderId).subscribe(baseObserver(
detail -> {
if (detail.getNeedSerialNumPic() != null && detail.getNeedSerialNumPic() == 1){
mIsShowSn.set(true);
mView.showSnView(true);
}else {
mIsShowSn.set(false);
mView.showSnView(false);
}
},
responeThrowable -> {
mIsShowSn.set(false);
mView.showSnView(false);
}));
}
@Override @Override
public void getPhone() { public void getPhone() {
mView.showDialog(); mView.showDialog();
......
...@@ -202,6 +202,7 @@ public class SopWebViewActivity extends BaseActivity<SopPresenter,ActivitySopWeb ...@@ -202,6 +202,7 @@ public class SopWebViewActivity extends BaseActivity<SopPresenter,ActivitySopWeb
bundle.putSerializable(OrderConstant.SPU, mSpu); bundle.putSerializable(OrderConstant.SPU, mSpu);
bundle.putParcelableArrayList(OrderConstant.SPUS, mSpus); bundle.putParcelableArrayList(OrderConstant.SPUS, mSpus);
bundle.putInt(Constants.ORDER_POSTION, 0); bundle.putInt(Constants.ORDER_POSTION, 0);
bundle.putInt(Constants.ORDER_ID, mOrderId);
bundle.putInt(Constants.STATE, mSpuState); bundle.putInt(Constants.STATE, mSpuState);
intent.putExtra(Constants.BUNDLE, bundle); intent.putExtra(Constants.BUNDLE, bundle);
startActivity(intent); startActivity(intent);
......
...@@ -7,6 +7,7 @@ import android.view.WindowManager; ...@@ -7,6 +7,7 @@ import android.view.WindowManager;
import com.dayu.order.R; import com.dayu.order.R;
import com.dayu.order.ui.fragment.HomeOrderFragment; import com.dayu.order.ui.fragment.HomeOrderFragment;
import com.dayu.utils.UserManager;
/** /**
...@@ -27,6 +28,8 @@ public class TestActivity extends AppCompatActivity { ...@@ -27,6 +28,8 @@ public class TestActivity extends AppCompatActivity {
} }
public void initView() { public void initView() {
UserManager.getInstance().initTestUserInfo();
getSupportFragmentManager().beginTransaction() getSupportFragmentManager().beginTransaction()
.add(R.id.fl_content, HomeOrderFragment.newInstance()) .add(R.id.fl_content, HomeOrderFragment.newInstance())
.commit(); .commit();
......
...@@ -409,9 +409,9 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -409,9 +409,9 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
} }
private void dumpProcessActivity(Order detail, int adapterPosition) { private void dumpProcessActivity(Order detail, int adapterPosition) {
Constants.serveOrderId = detail.getId();
Intent intent = new Intent(mContext, ProcessOrderActivity.class); Intent intent = new Intent(mContext, ProcessOrderActivity.class);
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putInt(Constants.ORDER_ID, detail.getId());
bundle.putInt(Constants.ORDER_POSTION, adapterPosition); bundle.putInt(Constants.ORDER_POSTION, adapterPosition);
intent.putExtra(Constants.BUNDLE, bundle); intent.putExtra(Constants.BUNDLE, bundle);
mContext.startActivity(intent); mContext.startActivity(intent);
...@@ -421,6 +421,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -421,6 +421,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
private void dumpServerActivity(Order order) { private void dumpServerActivity(Order order) {
Intent intent; Intent intent;
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
Constants.serveOrderId = order.getId();
if (order.getKaCompanyId() != null) { if (order.getKaCompanyId() != null) {
bundle.putInt(OrderConstant.KAADDRESSID, order.getKaCompanyId()); bundle.putInt(OrderConstant.KAADDRESSID, order.getKaCompanyId());
} }
...@@ -448,6 +449,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -448,6 +449,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
} }
private void dumpSOPActivity(int id, int adapterPosition) { private void dumpSOPActivity(int id, int adapterPosition) {
Constants.serveOrderId = id;
Intent intent = new Intent(mContext, SopWebViewActivity.class); Intent intent = new Intent(mContext, SopWebViewActivity.class);
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putInt(Constants.ORDER_ID, id); bundle.putInt(Constants.ORDER_ID, id);
......
...@@ -185,6 +185,7 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag ...@@ -185,6 +185,7 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag
EventBus.getDefault().post(new TakeOrderSuccessEvent()); EventBus.getDefault().post(new TakeOrderSuccessEvent());
ToastUtils.showLongToast(R.string.take_oreder_success_tosee); ToastUtils.showLongToast(R.string.take_oreder_success_tosee);
mBind.tvTakeOrder.setVisibility(View.GONE); mBind.tvTakeOrder.setVisibility(View.GONE);
mBind.tvOrderState.setText(getStaus(2));
}, responeThrowable ->{ }, responeThrowable ->{
EventBus.getDefault().post(new TakeOrderSuccessEvent()); EventBus.getDefault().post(new TakeOrderSuccessEvent());
ToastUtils.showShortToast(R.string.take_order_failure); ToastUtils.showShortToast(R.string.take_order_failure);
......
...@@ -67,14 +67,14 @@ public class OrderReceivingFragment extends BaseFragment<ReceivingPresenter, Fra ...@@ -67,14 +67,14 @@ public class OrderReceivingFragment extends BaseFragment<ReceivingPresenter, Fra
private void initListener() { private void initListener() {
mAdapter.setOnChildClickListener((view, adapter, position) -> { mAdapter.setOnChildClickListener((view, adapter, position) -> {
if (view.getId() == R.id.item_text_phone) { if (view.getId() == R.id.item_text_phone) {
int detectSatus = UserManager.getInstance().getUser().getDetectStatus(); // int detectSatus = UserManager.getInstance().getUser().getDetectStatus();
if (detectSatus == 2 || detectSatus == 3) { // if (detectSatus == 2 || detectSatus == 3) {
showCertificationDialog(); // showCertificationDialog();
} else { // } else {
Order order = (Order) adapter.getItem(position); Order order = (Order) adapter.getItem(position);
mPresenter.receiveOrder(order.getId(), mPresenter.getmUserId()); mPresenter.receiveOrder(order.getId(), mPresenter.getmUserId());
MobclickAgent.onEvent(mActivity, "recevie_order"); MobclickAgent.onEvent(mActivity, "recevie_order");
} // }
} }
}); });
} }
......
...@@ -200,7 +200,21 @@ ...@@ -200,7 +200,21 @@
android:text="@string/cash_pay" android:text="@string/cash_pay"
android:textColor="@color/cl_tab_init" android:textColor="@color/cl_tab_init"
android:textSize="14sp" android:textSize="14sp"
android:visibility="invisible" /> android:visibility="invisible"
/>
<TextView
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:background="@drawable/grey_commom"
android:padding="8dp"
android:text="@string/cash_pay"
android:textColor="@color/cl_tab_init"
android:textSize="14sp"
android:visibility="invisible"
/>
</LinearLayout> </LinearLayout>
......
...@@ -46,15 +46,12 @@ android { ...@@ -46,15 +46,12 @@ android {
sourceSets { sourceSets {
main { main {
manifest.srcFile 'src/main/AndroidManifest.xml' if (isSaleModule.toBoolean()) {
manifest.srcFile 'src/main/release/AndroidManifest.xml'
} else {
manifest.srcFile 'src/main/debug/AndroidManifest.xml'
}
} }
// main {
// if (isSaleModule.toBoolean()) {
// manifest.srcFile 'src/main/release/AndroidManifest.xml'
// } else {
// manifest.srcFile 'src/main/debug/AndroidManifest.xml'
// }
// }
} }
} }
......
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.bigfish.salecenter">
<application
android:allowBackup="true"
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme"
android:name="com.dayu.common.BaseApplication"
tools:replace="android:allowBackup"
tools:ignore="GoogleAppIndexingWarning">
<activity
android:name=".ui.activity.TestActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".ui.activity.ProductDetailActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
android:screenOrientation="portrait"
/>
<activity android:name=".ui.activity.SaleOrderDetailActivity"
android:screenOrientation="portrait"
/>
</application>
</manifest>
\ No newline at end of file
package com.bigfish.salecenter.ui.activity; package com.bigfish.salecenter.ui.activity;
import android.content.Intent;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction; import android.support.v4.app.FragmentTransaction;
...@@ -14,6 +15,7 @@ import com.dayu.base.api.Api; ...@@ -14,6 +15,7 @@ import com.dayu.base.api.Api;
import com.dayu.base.ui.activity.BaseActivity; import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.base.ui.presenter.SImplePresenter; import com.dayu.base.ui.presenter.SImplePresenter;
import com.umeng.analytics.MobclickAgent; import com.umeng.analytics.MobclickAgent;
import com.umeng.socialize.UMShareAPI;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -133,4 +135,10 @@ public class ProductDetailActivity extends BaseActivity<SImplePresenter, Activit ...@@ -133,4 +135,10 @@ public class ProductDetailActivity extends BaseActivity<SImplePresenter, Activit
super.onBackPressed(); super.onBackPressed();
} }
} }
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
UMShareAPI.get(this).onActivityResult(requestCode,resultCode,data);
}
} }
package com.bigfish.salecenter.ui.activity;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.view.Window;
import android.view.WindowManager;
import com.bigfish.salecenter.R;
import com.bigfish.salecenter.ui.fragment.HomeSaleFragment;
import com.dayu.utils.UserManager;
public class TestActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
WindowManager.LayoutParams.FLAG_FULLSCREEN);
supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
setContentView(R.layout.activity_common_test);
initView();
}
public void initView() {
UserManager.getInstance().initTestUserInfo();
getSupportFragmentManager().beginTransaction()
.add(R.id.fl_content, HomeSaleFragment.newInstance())
.commit();
}
}
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
android:exported="true" android:exported="true"
android:process=":channel"> android:process=":channel">
<intent-filter> <intent-filter>
<action android:name="com.dayu.bigfish.intent.action.COMMAND" /> <action android:name="${applicationId}.intent.action.COMMAND" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<action android:name="android.intent.action.PACKAGE_REMOVED" /> <action android:name="android.intent.action.PACKAGE_REMOVED" />
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
<provider <provider
android:name="com.umeng.message.provider.MessageProvider" android:name="com.umeng.message.provider.MessageProvider"
android:authorities="com.dayu.bigfish.umeng.message" android:authorities="${applicationId}.umeng.message"
android:exported="false"> android:exported="false">
<grant-uri-permission android:pathPattern=".*" /> <grant-uri-permission android:pathPattern=".*" />
</provider> </provider>
......
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.dayu.usercenter"> package="com.dayu.usercenter">
<application <application
...@@ -6,9 +7,11 @@ ...@@ -6,9 +7,11 @@
android:allowBackup="true" android:allowBackup="true"
android:label="@string/app_name" android:label="@string/app_name"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme"
tools:replace="android:allowBackup"
tools:ignore="GoogleAppIndexingWarning">
<activity <activity
android:name=".ui.activity.LoginActivity" android:name=".ui.activity.TestActivity"
android:launchMode="singleTask" android:launchMode="singleTask"
android:screenOrientation="portrait"> android:screenOrientation="portrait">
<intent-filter> <intent-filter>
...@@ -33,7 +36,7 @@ ...@@ -33,7 +36,7 @@
android:name=".ui.activity.PersonInfoActivity" android:name=".ui.activity.PersonInfoActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".ui.activity.TestActivity" android:name=".ui.activity.SmsLoginActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".ui.activity.WithdrawalsActivity" android:name=".ui.activity.WithdrawalsActivity"
...@@ -53,5 +56,47 @@ ...@@ -53,5 +56,47 @@
<activity <activity
android:name=".ui.activity.CertificationResultActivity" android:name=".ui.activity.CertificationResultActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.PwLoginActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.RegisterActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity.CommeWebViewActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity2.UserInfoActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity2.BusinessTypeActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity2.UserLicenceActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity2.SaleRecordActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity2.CommonRecordActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity2.EditBankActivity"
android:screenOrientation="portrait"
android:windowSoftInputMode="stateHidden" />
<activity
android:name=".ui.activity2.EditAddressActivity"
android:screenOrientation="portrait"
android:windowSoftInputMode="stateHidden" />
<activity
android:name=".ui.activity2.InvateNewActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity2.CashRecordActivity"
android:screenOrientation="portrait" />
</application> </application>
</manifest> </manifest>
...@@ -33,6 +33,15 @@ public class EngineerInfo extends BaseObservable implements Serializable { ...@@ -33,6 +33,15 @@ public class EngineerInfo extends BaseObservable implements Serializable {
private Object categorys; private Object categorys;
private Object providerTypeList; private Object providerTypeList;
private Object messageCheckcode; private Object messageCheckcode;
private String invitationCode;
public String getInvitationCode() {
return invitationCode;
}
public void setInvitationCode(String invitationCode) {
this.invitationCode = invitationCode;
}
public int getId() { public int getId() {
return id; return id;
......
...@@ -9,6 +9,7 @@ public class RegisterData { ...@@ -9,6 +9,7 @@ public class RegisterData {
public String realName; public String realName;
public String mobile; public String mobile;
public String password; public String password;
public String inviterCode;
public RegisterData(String accountUrl, String realName, String mobile, String password) { public RegisterData(String accountUrl, String realName, String mobile, String password) {
this.accountUrl = accountUrl; this.accountUrl = accountUrl;
......
...@@ -46,19 +46,27 @@ public class FaceCertificaitonPresenter extends FaceCertificaitonContract.Presen ...@@ -46,19 +46,27 @@ public class FaceCertificaitonPresenter extends FaceCertificaitonContract.Presen
@Override @Override
public void commitePhoto(List<File> list, String delta) { public void commitePhoto(List<File> list, String delta) {
mDelta = delta; mDelta = delta;
BaseApiFactory.uploadPhoto(packPhoto(list), "nowatermark").subscribe(baseObserver(this::verifyIdentity)); MultipartBody.Part[] part = packPhoto(list);
if (part != null){
BaseApiFactory.uploadPhoto(part, "nowatermark").subscribe(baseObserver(this::verifyIdentity));
}else {
ToastUtils.showShortToast("验证失败");
}
} }
private MultipartBody.Part[] packPhoto(List<File> files) { private MultipartBody.Part[] packPhoto(List<File> files) {
MultipartBody.Part[] part = new MultipartBody.Part[files.size()]; if (files != null && files.size() > 0) {
for (int i = 0; i < files.size(); i++) { MultipartBody.Part[] part = new MultipartBody.Part[files.size()];
RequestBody requestFile = for (int i = 0; i < files.size(); i++) {
RequestBody.create(MediaType.parse("multipart/form-data"), files.get(i)); RequestBody requestFile =
MultipartBody.Part body = RequestBody.create(MediaType.parse("multipart/form-data"), files.get(i));
MultipartBody.Part.createFormData("fileUpload", files.get(i).getName(), requestFile); MultipartBody.Part body =
part[i] = body; MultipartBody.Part.createFormData("fileUpload", files.get(i).getName(), requestFile);
part[i] = body;
}
return part;
} }
return part; return null;
} }
@Override @Override
......
package com.dayu.usercenter.presenter.homeuser; package com.dayu.usercenter.presenter.homeuser;
import android.content.Intent;
import android.databinding.ObservableField; import android.databinding.ObservableField;
import android.os.Bundle;
import com.dayu.common.Constants;
import com.dayu.usercenter.api.UserApiFactory; import com.dayu.usercenter.api.UserApiFactory;
import com.dayu.usercenter.ui.activity2.BusinessTypeActivity; import com.dayu.usercenter.ui.activity2.BusinessTypeActivity;
import com.dayu.usercenter.ui.activity2.CashRecordActivity; import com.dayu.usercenter.ui.activity2.CashRecordActivity;
...@@ -19,6 +22,7 @@ public class HomeUserPresenter extends HomeUserContract.Presenter { ...@@ -19,6 +22,7 @@ public class HomeUserPresenter extends HomeUserContract.Presenter {
public ObservableField<String> mUrl = new ObservableField<>(); public ObservableField<String> mUrl = new ObservableField<>();
private int mUid; private int mUid;
private String mInviteCode;
@Override @Override
public void onAttached() { public void onAttached() {
...@@ -41,14 +45,17 @@ public class HomeUserPresenter extends HomeUserContract.Presenter { ...@@ -41,14 +45,17 @@ public class HomeUserPresenter extends HomeUserContract.Presenter {
getRecordInfo(); getRecordInfo();
} }
public void getUserInfo(){ public void getUserInfo() {
UserApiFactory.getEngineerInfo(mUid).subscribe(baseObserver(data-> UserApiFactory.getEngineerInfo(mUid).subscribe(baseObserver(data ->{
mView.getPersonalInfoSuccess(data) mInviteCode = data.getInvitationCode();
mView.getPersonalInfoSuccess(data);
}
, responeThrowable -> mView.requestError())); , responeThrowable -> mView.requestError()));
} }
public void getRecordInfo(){
UserApiFactory.getOrderScore(mUid).subscribe(baseObserver(data-> public void getRecordInfo() {
mView.getOrderRecordSuccess(data) UserApiFactory.getOrderScore(mUid).subscribe(baseObserver(data ->
mView.getOrderRecordSuccess(data)
, responeThrowable -> mView.requestError())); , responeThrowable -> mView.requestError()));
} }
...@@ -57,6 +64,7 @@ public class HomeUserPresenter extends HomeUserContract.Presenter { ...@@ -57,6 +64,7 @@ public class HomeUserPresenter extends HomeUserContract.Presenter {
public void dumpToSetting() { public void dumpToSetting() {
mView.dumpToSetting(); mView.dumpToSetting();
} }
public void toUserSetting() { public void toUserSetting() {
mView.startActivity(UserInfoActivity.class); mView.startActivity(UserInfoActivity.class);
} }
...@@ -77,8 +85,11 @@ public class HomeUserPresenter extends HomeUserContract.Presenter { ...@@ -77,8 +85,11 @@ public class HomeUserPresenter extends HomeUserContract.Presenter {
} }
public void dumpToInvate() { public void dumpToInvate() {
mView.startActivity(InvateNewActivity.class); Bundle bundle = new Bundle();
bundle.putString(Constants.INVITE_CODE,mInviteCode);
mView.startActivity(InvateNewActivity.class,bundle);
} }
public void dumpToCacheRecord() { public void dumpToCacheRecord() {
mView.startActivity(CashRecordActivity.class); mView.startActivity(CashRecordActivity.class);
} }
......
...@@ -145,6 +145,7 @@ public class RegisterActivity extends BaseActivity<SImplePresenter, ActivityRegi ...@@ -145,6 +145,7 @@ public class RegisterActivity extends BaseActivity<SImplePresenter, ActivityRegi
String phone = mBind.edtPhone.getText().toString(); String phone = mBind.edtPhone.getText().toString();
String pwd = mBind.edtPwd.getText().toString(); String pwd = mBind.edtPwd.getText().toString();
RegisterData rData = new RegisterData(avatarUrl,name,phone, MD5Util.encrypt(pwd)); RegisterData rData = new RegisterData(avatarUrl,name,phone, MD5Util.encrypt(pwd));
rData.inviterCode = mBind.edtInviteCode.getText().toString().trim();
UserApiFactory.register(rData).subscribe( UserApiFactory.register(rData).subscribe(
mPresenter.baseObserver(success -> { mPresenter.baseObserver(success -> {
if (success){ if (success){
......
...@@ -24,6 +24,8 @@ import java.lang.reflect.Field; ...@@ -24,6 +24,8 @@ import java.lang.reflect.Field;
*/ */
public class SmsCodeActivity extends BaseActivity<SmsLoginPresenter, ActivitySmsCodeBinding> implements SmsLoginContract.View { public class SmsCodeActivity extends BaseActivity<SmsLoginPresenter, ActivitySmsCodeBinding> implements SmsLoginContract.View {
CustomDialog customDialog;
@Override @Override
public void setPresenter() { public void setPresenter() {
mBind.setPresenter(mPresenter); mBind.setPresenter(mPresenter);
...@@ -74,7 +76,7 @@ public class SmsCodeActivity extends BaseActivity<SmsLoginPresenter, ActivitySms ...@@ -74,7 +76,7 @@ public class SmsCodeActivity extends BaseActivity<SmsLoginPresenter, ActivitySms
@Override @Override
public void showLoginDialog(OnCloseListener listener) { public void showLoginDialog(OnCloseListener listener) {
CustomDialog customDialog = new CustomDialog(mActivity, R.style.CustomDialog, getString(R.string.engineer_identity_not_audite) customDialog = new CustomDialog(mActivity, R.style.CustomDialog, getString(R.string.engineer_identity_not_audite)
, listener); , listener);
customDialog.setTitle(getString(R.string.certification)) customDialog.setTitle(getString(R.string.certification))
.setPositiveButton(getString(R.string.go_certification)) .setPositiveButton(getString(R.string.go_certification))
...@@ -92,4 +94,12 @@ public class SmsCodeActivity extends BaseActivity<SmsLoginPresenter, ActivitySms ...@@ -92,4 +94,12 @@ public class SmsCodeActivity extends BaseActivity<SmsLoginPresenter, ActivitySms
UIUtils.setShakeAnimation(mBind.error); UIUtils.setShakeAnimation(mBind.error);
} }
} }
@Override
protected void onStop() {
super.onStop();
if (customDialog != null && customDialog.isShowing()){
customDialog.dismiss();
}
}
} }
...@@ -7,6 +7,8 @@ import android.view.WindowManager; ...@@ -7,6 +7,8 @@ import android.view.WindowManager;
import com.dayu.usercenter.R; import com.dayu.usercenter.R;
import com.dayu.usercenter.ui.fragment.HomePersonFragment; import com.dayu.usercenter.ui.fragment.HomePersonFragment;
import com.dayu.usercenter.ui.fragment.HomeUserFragment;
import com.dayu.utils.UserManager;
/** /**
* Created by luofan * Created by luofan
...@@ -26,8 +28,9 @@ public class TestActivity extends AppCompatActivity { ...@@ -26,8 +28,9 @@ public class TestActivity extends AppCompatActivity {
} }
public void initView() { public void initView() {
UserManager.getInstance().initTestUserInfo();
getSupportFragmentManager().beginTransaction() getSupportFragmentManager().beginTransaction()
.add(R.id.fl_content, HomePersonFragment.newInstance()) .add(R.id.fl_content, HomeUserFragment.newInstance())
.commit(); .commit();
} }
} }
package com.dayu.usercenter.ui.activity2; package com.dayu.usercenter.ui.activity2;
import android.content.Intent;
import android.text.TextUtils;
import com.dayu.base.ui.activity.BaseActivity; import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.base.ui.presenter.SImplePresenter; import com.dayu.base.ui.presenter.SImplePresenter;
import com.dayu.common.Constants;
import com.dayu.usercenter.R; import com.dayu.usercenter.R;
import com.dayu.usercenter.api.UserApiFactory;
import com.dayu.usercenter.databinding.ActivityInvateNewBinding; import com.dayu.usercenter.databinding.ActivityInvateNewBinding;
import com.dayu.utils.CommonUtils;
import com.dayu.utils.ToastUtils;
import com.umeng.socialize.UMShareAPI;
import com.umeng.socialize.UMShareListener;
import com.umeng.socialize.bean.SHARE_MEDIA;
/** /**
* 邀请新人有奖 * 邀请新人有奖
*/ */
public class InvateNewActivity extends BaseActivity<SImplePresenter,ActivityInvateNewBinding> { public class InvateNewActivity extends BaseActivity<SImplePresenter, ActivityInvateNewBinding> {
private String mInviteCode;
@Override @Override
public void setPresenter() { public void setPresenter() {
...@@ -21,6 +33,57 @@ public class InvateNewActivity extends BaseActivity<SImplePresenter,ActivityInva ...@@ -21,6 +33,57 @@ public class InvateNewActivity extends BaseActivity<SImplePresenter,ActivityInva
@Override @Override
public void initView() { public void initView() {
mBind.receivingBack.setOnClickListener(v->dumpBack()); initUser();
mInviteCode = getBundle().getString(Constants.INVITE_CODE);
if (TextUtils.isEmpty(mInviteCode)) {
getCode();
} else {
mBind.tvCode.setText(mInviteCode);
}
mBind.receivingBack.setOnClickListener(v -> dumpBack());
setListener();
}
//分享按钮点击事件
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() {
@Override
public void onStart(SHARE_MEDIA share_media) {
}
@Override
public void onResult(SHARE_MEDIA share_media) {
if (share_media == SHARE_MEDIA.WEIXIN_CIRCLE) {
ToastUtils.showShortToast(R.string.share_finish);
}
}
@Override
public void onError(SHARE_MEDIA share_media, Throwable throwable) {
}
@Override
public void onCancel(SHARE_MEDIA share_media) {
}
});
});
}
//重新请求个人信息获取邀请码
private void getCode() {
showDialog();
UserApiFactory.getEngineerInfo(mUserId).subscribe(mPresenter.baseObserver(data -> {
mInviteCode = data.getInvitationCode();
mBind.tvCode.setText(mInviteCode);
}));
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
UMShareAPI.get(this).onActivityResult(requestCode, resultCode, data);
} }
} }
...@@ -66,9 +66,10 @@ ...@@ -66,9 +66,10 @@
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".ui.activity.CertificationResultActivity" android:name=".ui.activity.CertificationResultActivity"
android:screenOrientation="portrait" /> <activity android:screenOrientation="portrait" />
android:name=".ui.activity.CommeWebViewActivity" <activity
android:screenOrientation="portrait" /> android:name=".ui.activity.CommeWebViewActivity"
android:screenOrientation="portrait" />
<activity <activity
android:name=".ui.activity2.UserInfoActivity" android:name=".ui.activity2.UserInfoActivity"
...@@ -88,12 +89,12 @@ ...@@ -88,12 +89,12 @@
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".ui.activity2.EditBankActivity" android:name=".ui.activity2.EditBankActivity"
android:windowSoftInputMode="stateHidden" android:screenOrientation="portrait"
android:screenOrientation="portrait" /> android:windowSoftInputMode="stateHidden" />
<activity <activity
android:name=".ui.activity2.EditAddressActivity" android:name=".ui.activity2.EditAddressActivity"
android:windowSoftInputMode="stateHidden" android:screenOrientation="portrait"
android:screenOrientation="portrait" /> android:windowSoftInputMode="stateHidden" />
<activity <activity
android:name=".ui.activity2.InvateNewActivity" android:name=".ui.activity2.InvateNewActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
......
...@@ -61,12 +61,13 @@ ...@@ -61,12 +61,13 @@
android:textStyle="bold" android:textStyle="bold"
/> />
<TextView <TextView
android:id="@+id/tv_code"
style="@style/common_text_style" style="@style/common_text_style"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:textSize="20sp" android:textSize="20sp"
android:textStyle="bold" android:textStyle="bold"
android:textColor="@color/color_orange" android:textColor="@color/color_orange"
android:text="S01023" android:text=""
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
/> />
......
...@@ -303,9 +303,9 @@ ...@@ -303,9 +303,9 @@
android:layout_height="35dp" android:layout_height="35dp"
android:layout_marginLeft="15dp" android:layout_marginLeft="15dp"
android:background="@drawable/bg_input_register_react" android:background="@drawable/bg_input_register_react"
android:inputType="textPassword"
android:maxLength="18" android:maxLength="18"
android:maxLines="1" android:maxLines="1"
android:singleLine="true"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:textSize="13sp" /> android:textSize="13sp" />
......
...@@ -37,4 +37,7 @@ ...@@ -37,4 +37,7 @@
<string name="invate_reward_rule2">2、请务必提醒被邀请人在注册APP时准确输入您的【专属邀请码】;如果输入错误或忘记输入,系统无法识别并记账。</string> <string name="invate_reward_rule2">2、请务必提醒被邀请人在注册APP时准确输入您的【专属邀请码】;如果输入错误或忘记输入,系统无法识别并记账。</string>
<string name="remember_your_invate_code">请牢记您的专属邀请码:</string> <string name="remember_your_invate_code">请牢记您的专属邀请码:</string>
<string name="forward_invate_now">马上转发\n【大鱼师傅APP】注册链接</string> <string name="forward_invate_now">马上转发\n【大鱼师傅APP】注册链接</string>
<string name="share_finish">分享结束</string>
<string name="invite_new_share_title">大鱼师傅</string>
<string name="invite_new_share_content">邀请师傅瓜分千万佣金!</string>
</resources> </resources>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment