diff --git a/appbase/build.properties b/appbase/build.properties index 981fcb9..47ce062 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 15 15:30:02 HKT 2025 +#Mon Mar 17 01:36:14 GMT 2025 stageCount=3 libraryProject=libappbase baseVersion=15.0 publishVersion=15.0.2 -buildCount=0 +buildCount=47 baseBetaVersion=15.0.3 diff --git a/appbase/src/main/res/values/colors.xml b/appbase/src/main/res/values/colors.xml index 18d6383..87d3836 100644 --- a/appbase/src/main/res/values/colors.xml +++ b/appbase/src/main/res/values/colors.xml @@ -1,6 +1,7 @@ - #005800FF - #005800FF - #005800FF + #FF00B322 + #FF005C12 + #FF8DFFA2 + #FFFFFB8D diff --git a/libappbase/build.properties b/libappbase/build.properties index 568d2db..47ce062 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 15 15:29:07 HKT 2025 +#Mon Mar 17 01:36:14 GMT 2025 stageCount=3 libraryProject=libappbase baseVersion=15.0 publishVersion=15.0.2 -buildCount=0 +buildCount=47 baseBetaVersion=15.0.3 diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogView.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/LogView.java index 6d04438..9b8721d 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogView.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/LogView.java @@ -190,6 +190,7 @@ public class LogView extends RelativeLayout { // 加载标签表 mListViewTags = findViewById(cc.winboll.studio.libappbase.R.id.tags_listview); + mListViewTags.setVerticalOffset(10); mTAGListAdapter = new TAGListAdapter(mContext, mapTAGList); mListViewTags.setAdapter(mTAGListAdapter); diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/views/HorizontalListView.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/views/HorizontalListView.java index 043c24b..782d8fa 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/views/HorizontalListView.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/views/HorizontalListView.java @@ -12,7 +12,9 @@ import android.widget.ListView; import cc.winboll.studio.libappbase.LogUtils; public class HorizontalListView extends ListView { + public static final String TAG = "HorizontalListView"; + int verticalOffset = 0; public HorizontalListView(Context context) { super(context); @@ -25,25 +27,10 @@ public class HorizontalListView extends ListView { public HorizontalListView(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); } -// @Override -// protected void onLayout(boolean changed, int l, int t, int r, int b) { -// super.onLayout(changed, l, t, r, b); -// int childCount = getChildCount(); -// int left = getPaddingLeft(); -// // 获取HorizontalListView的高度 -// int viewHeight = getMeasuredHeight() - getPaddingTop() - getPaddingBottom(); -// for (int i = 0; i < childCount; i++) { -// View child = getChildAt(i); -// int width = child.getMeasuredWidth(); -// int height = child.getMeasuredHeight(); -// // 计算子项在垂直方向上的居中偏移量 -// int verticalOffset = (viewHeight - height) / 2; -// // 设置子视图的位置，实现水平布局并垂直居中 -// child.layout(left, getPaddingTop() + verticalOffset, left + width, getPaddingTop() + verticalOffset + height); -// left += width; -// } -// } -// + + public void setVerticalOffset(int verticalOffset) { + this.verticalOffset = verticalOffset; + } @Override protected void onLayout(boolean changed, int l, int t, int r, int b) { @@ -52,7 +39,7 @@ public class HorizontalListView extends ListView { int left = getPaddingLeft(); int viewHeight = getMeasuredHeight() - getPaddingTop() - getPaddingBottom(); LogUtils.d(TAG, String.format("HorizontalListView的高度 %d", viewHeight)); - int verticalOffset = 20; + for (int i = 0; i < childCount; i++) { View child = getChildAt(i); // 计算每个子视图的宽度和高度 @@ -60,7 +47,7 @@ public class HorizontalListView extends ListView { int height = child.getMeasuredHeight(); //LogUtils.d(TAG, String.format("child : width %d , height %d", width, height)); // 设置子视图的位置，实现水平布局 - + child.layout(left, verticalOffset, left + width, verticalOffset + height); left += width; } @@ -68,15 +55,11 @@ public class HorizontalListView extends ListView { @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { - int newHeightMeasureSpec = MeasureSpec.makeMeasureSpec(Integer.MAX_VALUE >> 2, MeasureSpec.AT_MOST); //super.onMeasure(widthMeasureSpec, newHeightMeasureSpec); int newWidthMeasureSpec = MeasureSpec.makeMeasureSpec(Integer.MAX_VALUE >> 2, MeasureSpec.AT_MOST); //LogUtils.d(TAG, String.format("newWidthMeasureSpec %d, newHeightMeasureSpec %d", newWidthMeasureSpec, newHeightMeasureSpec)); super.onMeasure(newWidthMeasureSpec, newHeightMeasureSpec); - -// ViewGroup.LayoutParams params = getLayoutParams(); -// params.width = getMeasuredWidth(); } } diff --git a/libappbase/src/main/res/drawable/view_border.xml b/libappbase/src/main/res/drawable/bg_border.xml similarity index 100% rename from libappbase/src/main/res/drawable/view_border.xml rename to libappbase/src/main/res/drawable/bg_border.xml diff --git a/libappbase/src/main/res/drawable/bg_border_round.xml b/libappbase/src/main/res/drawable/bg_border_round.xml new file mode 100644 index 0000000..2036d51 --- /dev/null +++ b/libappbase/src/main/res/drawable/bg_border_round.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/libappbase/src/main/res/drawable/bg_shadow.xml b/libappbase/src/main/res/drawable/bg_shadow.xml index 6d3d898..f4d1bd7 100644 --- a/libappbase/src/main/res/drawable/bg_shadow.xml +++ b/libappbase/src/main/res/drawable/bg_shadow.xml @@ -10,8 +10,8 @@ + android:endColor="@color/colorAccent" + android:startColor="@color/colorAccent" /> + android:background="@drawable/bg_border_round"> - + - + diff --git a/libappbase/src/main/res/layout/view_log.xml b/libappbase/src/main/res/layout/view_log.xml index f3f312b..fdf3f3d 100644 --- a/libappbase/src/main/res/layout/view_log.xml +++ b/libappbase/src/main/res/layout/view_log.xml @@ -72,27 +72,29 @@ android:layout_below="@+id/viewlogRelativeLayoutToolbar" android:id="@+id/viewlogLinearLayout1" android:gravity="center_vertical" - android:background="#FFC0F4C2"> + android:background="@drawable/bg_shadow"> + android:id="@+id/viewlogCheckBox1" + android:background="@drawable/bg_border_round" + android:layout_marginLeft="5dp" + android:layout_marginRight="5dp"/> + android:padding="5dp" + android:layout_weight="1.0"> + android:id="@+id/tags_listview"/> diff --git a/libappbase/src/main/res/values/dimens.xml b/libappbase/src/main/res/values/dimens.xml new file mode 100644 index 0000000..25f95ea --- /dev/null +++ b/libappbase/src/main/res/values/dimens.xml @@ -0,0 +1,9 @@ + + + + 16sp + + 8dp + + 24dp +