diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/controller/constant/ConstUrl.java b/app/src/main/java/com/xuebiping/bolizhuzi/controller/constant/ConstUrl.java index fb9d86e..dc770a0 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/controller/constant/ConstUrl.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/controller/constant/ConstUrl.java @@ -24,7 +24,8 @@ public class ConstUrl { public static final String SOCKET_USERSTATIS = "wss://ws.whnuanbeinikj.cn?user_id="; public static final String SOCKET_SPEED_DATE = DEBUG ? (DEBUG1 ? "wss://pre.ws.whnuanbeinikj.cn/speed?token=" : "wss://ws.whnuanbeinikj.cn/speed?token=") : "wss://ws.whnuanbeinikj.cn/speed?token="; - public final static String IMAGE_URL = "http://qianyan-asset.oss-cn-shanghai.aliyuncs.com/"; + //public final static String IMAGE_URL = "http://qianyan-asset.oss-cn-shanghai.aliyuncs.com/"; + public final static String IMAGE_URL = "http://oss.jindashengkj.cn/"; public final static String BASE_URL = BASE_ROOT + "api/"; public final static String APP_FIELD = "app/"; public final static String AUTH_FIELD = "passport/"; diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/controller/settings/adapter/InfoEditPhotoRecyclerAdapter.java b/app/src/main/java/com/xuebiping/bolizhuzi/controller/settings/adapter/InfoEditPhotoRecyclerAdapter.java index e4e51ea..8ea4e72 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/controller/settings/adapter/InfoEditPhotoRecyclerAdapter.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/controller/settings/adapter/InfoEditPhotoRecyclerAdapter.java @@ -127,13 +127,13 @@ public class InfoEditPhotoRecyclerAdapter extends RecyclerView.Adapter implement } else if (0 == position) { dataHolder.mDeleteView.setVisibility(View.VISIBLE); - dataHolder.mHeadPhotoView.setVisibility(View.VISIBLE); - dataHolder.mPhotoView.setVisibility(GONE); + dataHolder.mHeadPhotoView.setVisibility(GONE); + dataHolder.mPhotoView.setVisibility(View.VISIBLE); dataHolder.mEmptyView.setVisibility(GONE); if (imagePath.contains("uploads/")) { - dataHolder.mHeadPhotoView.setImageURI(StrU.getResourcePath(imagePath, mContext)); + dataHolder.mPhotoView.setImageURI(StrU.getResourcePath(imagePath, mContext)); } else { - dataHolder.mHeadPhotoView.setImageURI("file://" + imagePath); + dataHolder.mPhotoView.setImageURI("file://" + imagePath); } } else { diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/InvitationActivity.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/InvitationActivity.java index b94eb59..bde2ec1 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/InvitationActivity.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/InvitationActivity.java @@ -41,6 +41,8 @@ public class InvitationActivity extends BaseActivity implements private String qrImageUrl; ActivityInvitationBinding binding; private List posterList; + private TextView tv_zg; + private TextView tv_my_fc_bl; @Override @@ -77,6 +79,9 @@ public class InvitationActivity extends BaseActivity implements // }); + tv_zg = findViewById(R.id.tv_zg); + tv_my_fc_bl = findViewById(R.id.tv_my_fc_bl); + mShareDialog = new BottomShareDialog(this, R.style.SelectiveDialog); mShareDialog.setOnButtonSelectListener(this); binding.ruleBtn.setOnClickListener(new View.OnClickListener() { @@ -100,6 +105,13 @@ public class InvitationActivity extends BaseActivity implements mShareDialog.show(); } }); + + /*binding.tv_share_btn.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + mShareDialog.show(); + } + });*/ if (UserManager.getUserInfo().getGender() == 2) { binding.tvManTip.setVisibility(View.GONE); binding.menTip1.setVisibility(View.GONE); @@ -200,6 +212,9 @@ public class InvitationActivity extends BaseActivity implements binding.firstLabel.setText(result.getReward().getFirst()); binding.secondLabel.setText(result.getReward().getSecond()); binding.thirdLabel.setText(result.getReward().getThird()); + //TODO 需要接口返回准确数据 + tv_zg.setText("最高" + result.getReward().getFour() +"分成"); + tv_my_fc_bl.setText(result.getReward().getThird()); binding.fourLabel.setText(result.getReward().getFour() + ""); posterList = result.getAvatar_list(); binding.totalPeopleLabel.setText(result.getTotal().getTotal_invite() + ""); diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SettingFragment.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SettingFragment.java index 81cd702..52bc218 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SettingFragment.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SettingFragment.java @@ -853,10 +853,8 @@ public class SettingFragment extends Fragment implements View.OnClickListener { mName.setText("每日任务"); view.setOnClickListener(view16 -> { if (!BaseApplication.getInstance().showCertificationDialog(getActivity())) { - /*Intent intent = new Intent(getActivity(), MissionActivity.class); - startActivity(intent);*/ - - startActivity(new Intent(getActivity(), UpPrivilegeActivity.class)); + Intent intent = new Intent(getActivity(), MissionActivity.class); + startActivity(intent); } }); break; diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SettingFragment2.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SettingFragment2.java index b0468f4..3446df2 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SettingFragment2.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/SettingFragment2.java @@ -671,7 +671,6 @@ public class SettingFragment2 extends Fragment implements View.OnClickListener { view.setOnClickListener(view19 -> { if (!BaseApplication.getInstance().showCertificationDialog(getActivity())) { startActivity(new Intent(getActivity(), GoddessPrivilegeActivity.class)); -// startActivity(new Intent(getActivity(), UpPrivilegeActivity.class)); } }); break; diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/UpPrivilegeActivity.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/UpPrivilegeActivity.java index 77c5610..337cb97 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/UpPrivilegeActivity.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/UpPrivilegeActivity.java @@ -291,7 +291,7 @@ public class UpPrivilegeActivity extends BaseActivity implements View.OnClickLis formDTO = result.getForm(); if(formDTO != null) { sd_avatar.setImageURI(ConstUrl.IMAGE_URL + formDTO.getAvatar()); - //sd_avatar.setImageURI("http://xqasset.whnuanbeinikj.cn/uploads/album/202604/02/c0b2434c43939911a34f5dffb03f2101_.pic.jpg"); + //sd_avatar.setImageURI("http://oss.jindashengkj.cn/uploads/album/202604/02/c0b2434c43939911a34f5dffb03f2101_.pic.jpg"); tv_nikename.setText(formDTO.getNickname()); tv_sign.setText(formDTO.getSignature()); diff --git a/app/src/main/res/drawable-xhdpi/ic_zg_invite_bg.png b/app/src/main/res/drawable-xhdpi/ic_zg_invite_bg.png new file mode 100644 index 0000000..4a9009a Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_zg_invite_bg.png differ diff --git a/app/src/main/res/drawable/bg_e9403d.xml b/app/src/main/res/drawable/bg_e9403d.xml new file mode 100644 index 0000000..86fd253 --- /dev/null +++ b/app/src/main/res/drawable/bg_e9403d.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_invite.xml b/app/src/main/res/drawable/bg_invite.xml new file mode 100644 index 0000000..1f4e742 --- /dev/null +++ b/app/src/main/res/drawable/bg_invite.xml @@ -0,0 +1,13 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_invite_share.xml b/app/src/main/res/drawable/bg_invite_share.xml new file mode 100644 index 0000000..9b880fe --- /dev/null +++ b/app/src/main/res/drawable/bg_invite_share.xml @@ -0,0 +1,13 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_invitation.xml b/app/src/main/res/layout/activity_invitation.xml index 5e285a8..6199151 100644 --- a/app/src/main/res/layout/activity_invitation.xml +++ b/app/src/main/res/layout/activity_invitation.xml @@ -40,6 +40,7 @@ + android:src="@mipmap/ic_invite_01" /> + + + + + + + + - + android:paddingEnd="16dp"> - + android:background="@drawable/bg_invite_share" /> - + android:background="@drawable/bg_invite_share" /> - + - + android:orientation="vertical" + android:background="@drawable/bg_invite"> @@ -408,14 +460,15 @@ android:layout_margin="16dp" android:drawableRight="@mipmap/indicator_right" android:text="我邀请的人" + android:visibility="gone" android:textColor="#ffc3342b" android:textSize="12dp" /> + + - + + + + + + + + + + + + + + diff --git a/uikit/src/main/res/layout/dialog_share.xml b/uikit/src/main/res/layout/dialog_share.xml index fb246b4..7a0cd9d 100644 --- a/uikit/src/main/res/layout/dialog_share.xml +++ b/uikit/src/main/res/layout/dialog_share.xml @@ -78,6 +78,7 @@ android:textSize="13sp" /> +