yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_改版主分支' into dev_改版主分支

Browse Source
This commit is contained in:
zlzw
2024-03-26 09:37:13 +08:00
parent 7cffce8760 0324b638fa
commit 33b1f6101f
7 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
main/src/main/java/com/yunbao/main/activity/CommunitySendActivity.java
View File

@@ -55,6 +55,8 @@ import java.util.Date;
import java.util.List;
import java.util.Objects;
import io.rong.imkit.picture.tools.DateUtils;
public class CommunitySendActivity extends AbsActivity {
public static final int PERMISSION_REQUEST_CODE_IMG = 0;
public static final int PERMISSION_REQUEST_CODE_VIDEO = 1;
@@ -91,7 +93,7 @@ public class CommunitySendActivity extends AbsActivity {
@Override
protected void main() {
newCommunityTypeList = CommonAppConfig.getCommunityTypeList(mContext);
newCommunityTypeList = CommonAppConfig.getCommunityTypeList(false, mContext);
content = findViewById(R.id.content);
submit = findViewById(R.id.submit);
submit.setVisibility(View.VISIBLE);
@@ -214,7 +216,7 @@ public class CommunitySendActivity extends AbsActivity {
@Override
public void onDel(int position) {
activeImageAdapter.deleteItem(position);
}
});
}
@@ -222,7 +224,6 @@ public class CommunitySendActivity extends AbsActivity {
private void submit() {
if (isImage) {
if (imgUrlList.size() == 0) {
return;
}
} else {
@@ -289,10 +290,17 @@ public class CommunitySendActivity extends AbsActivity {
public void showTimeChooseDialog() {
Calendar startCalendar = Calendar.getInstance();
//startCalendar.set(1990, 1, 1);
startCalendar.set(1990, 1, 1);
Calendar endCalendar = Calendar.getInstance();
endCalendar.setTime(new Date());
Calendar calendar = Calendar.getInstance();
int year = calendar.get(Calendar.YEAR);
int month = calendar.get(Calendar.MONTH) + 1; // Calendar.MONTH 从0开始计数
int day = calendar.get(Calendar.DAY_OF_MONTH);
int hour = calendar.get(Calendar.HOUR); // 使用24小时制
int minute = calendar.get(Calendar.MINUTE);
int second = calendar.get(Calendar.SECOND);
endCalendar.set(year, month, day, hour, minute, second);
TimePickerView timePickerView = new TimePickerBuilder(CommunitySendActivity.this, new OnTimeSelectListener() {
@SuppressLint("SetTextI18n")
@Override
@@ -306,8 +314,7 @@ public class CommunitySendActivity extends AbsActivity {
.setTitleText("")//标题文字
.setOutSideCancelable(true)//点击屏幕，点在控件外部范围时，是否取消显示
.isCyclic(false)//是否循环滚动
.setRangDate(startCalendar, endCalendar)
.setLabel("", "", "", "", "", "")//默认设置为年月日时分秒
.setDate(endCalendar).setRangDate(startCalendar, endCalendar).setLabel("", "", "", "", "", "")//默认设置为年月日时分秒
.isCenterLabel(false) //是否只显示中间选中项的label文字，false则每项item全部都带有label。
.build();
timePickerView.show();

25
main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java
View File

@@ -243,6 +243,7 @@ public class UserHomeActivity extends AbsActivity {
authorIcon.setVisibility(View.VISIBLE);
authenticationLayout.setVisibility(View.VISIBLE);
} else {
imgUp.setVisibility(View.GONE);
authorIcon.setVisibility(View.GONE);
authenticationLayout.setVisibility(View.GONE);
}
@@ -309,7 +310,12 @@ public class UserHomeActivity extends AbsActivity {
}
});
bannerImgList = userInfo.getUserHomeTopInfo().getUser_home_banner();
bannerImgList = new ArrayList<>();
if (isAnchor) {
bannerImgList = userInfo.getUserHomeTopInfo().getUser_home_banner();
} else {
bannerImgList.add(userInfo.getUserHomeTopInfo().getUser_avatar());
}
tempList = new ArrayList<>();
for (int i = 0; i < bannerImgList.size(); i++) {
tempList.add(new UserHomeImgBean(bannerImgList.get(i)));
@@ -768,23 +774,10 @@ public class UserHomeActivity extends AbsActivity {
tempList.get(0).setShow(true);
}
userHomeImgAdapter.setCommentBeanList(tempList);
} else {
ToastUtil.show(msg);
}
}
});
}
private File uri2File(Uri uri) {
String img_path;
String[] proj = {MediaStore.Images.Media.DATA};
Cursor actualimagecursor = this.managedQuery(uri, proj, null, null, null);
if (actualimagecursor == null) {
img_path = uri.getPath();
} else {
int actual_image_column_index = actualimagecursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
actualimagecursor.moveToFirst();
img_path = actualimagecursor.getString(actual_image_column_index);
}
File file = new File(img_path);
return file;
}
}

2
main/src/main/java/com/yunbao/main/views/MainHomeNewViewHolder.java
View File

@@ -93,7 +93,7 @@ public class MainHomeNewViewHolder extends AbsMainHomeChildViewHolder implements
@Override
public void init() {
List<NewCommunityType> list = CommonAppConfig.getCommunityTypeList(mContext);
List<NewCommunityType> list = CommonAppConfig.getCommunityTypeList(true,mContext);
typeHot = list.get(0).getTalk_name();
select = list.get(0).getId();