1、修复新增家庭设备时存在备忘录问题\n2、旅游模块新增加“感言”、“其他费用”、“备注”字段

Linjiajia

2024-02-28 b2dc509d5530a9af3b48d7dce7db1e7bf66b06d5

 app/src/main/java/com/application/zhangshi_app_android/widget/DoubleNode.java

@@ -25,6 +25,7 @@
    public DoubleNode(Context context,HomeRootBean member) {
        super(context,member);
        member.getSpouse().setSpouse(member);
        initView();
        //双亲节点 前后路径长度 有两倍的 pathLength
        if (member.getIdentity() > 1 && member.getChildList() != null && member.getChildList().size() > 0){
            //非 第一代 且 有子代, 节点宽度 = view宽度 + 前后路径长度 + 展开按钮宽度
@@ -41,12 +42,11 @@
        }
        //双亲节点 高度 = view高度 + 配偶view高度 + 配偶view上下间距
        height = getItemViewHeight() * 2 + spouseMargin;
        initView();
    }

    private void initView() {
        memberItemView = createItemView(member);
        spouseView = createItemView(member.getSpouse());
        memberItemView = createItemView(member, true);
        spouseView = createItemView(member.getSpouse(),false);
        expandIconView = createExpandIconView();
        viewList.add(memberItemView);
        viewList.add(spouseView);
@@ -89,8 +89,10 @@
        } else {
            viewLeft = left;
        }

        memberItemView.setX(viewLeft);
        memberItemView.setY(centerY - memberItemView.getMeasuredHeight() - spouseMargin/2f);

        viewRight = viewLeft + memberItemView.getMeasuredWidth();

        spouseView.setX(viewLeft);
@@ -241,4 +243,19 @@
        forkPathList.add(path);
    }

    @Override
    public int getItemViewWidth() {
        if (memberItemView != null){
            return memberItemView.getMeasuredWidth();
        }
        return 0;
    }

    @Override
    public int getItemViewHeight() {
        if (memberItemView != null){
            return memberItemView.getMeasuredHeight();
        }
        return 0;
    }
}