diff --git a/app/src/main/java/com/unnamed/b/atv/sample/activity/MainActivity.java b/app/src/main/java/com/unnamed/b/atv/sample/activity/MainActivity.java index f74bea2..0ad2862 100644 --- a/app/src/main/java/com/unnamed/b/atv/sample/activity/MainActivity.java +++ b/app/src/main/java/com/unnamed/b/atv/sample/activity/MainActivity.java @@ -13,6 +13,8 @@ import com.unnamed.b.atv.sample.fragment.CustomViewHolderFragment; import com.unnamed.b.atv.sample.fragment.FolderStructureFragment; import com.unnamed.b.atv.sample.fragment.SelectableTreeFragment; +import com.unnamed.b.atv.sample.fragment.ShootFragment; +import com.unnamed.b.atv.sample.fragment.ShootHistoryFragment; import com.unnamed.b.atv.sample.fragment.TwoDScrollingArrowExpandFragment; import com.unnamed.b.atv.sample.fragment.TwoDScrollingFragment; @@ -36,6 +38,8 @@ protected void onCreate(Bundle savedInstanceState) { listItems.put("Selectable Nodes", SelectableTreeFragment.class); listItems.put("2d scrolling", TwoDScrollingFragment.class); listItems.put("Expand with arrow only", TwoDScrollingArrowExpandFragment.class); + listItems.put("当前任务", ShootFragment.class); + listItems.put("历史任务", ShootHistoryFragment.class); final List list = new ArrayList(listItems.keySet()); diff --git a/app/src/main/java/com/unnamed/b/atv/sample/fragment/ShootFragment.java b/app/src/main/java/com/unnamed/b/atv/sample/fragment/ShootFragment.java new file mode 100644 index 0000000..8eb6d27 --- /dev/null +++ b/app/src/main/java/com/unnamed/b/atv/sample/fragment/ShootFragment.java @@ -0,0 +1,136 @@ +package com.unnamed.b.atv.sample.fragment; + +import android.app.Fragment; +import android.os.Bundle; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Toast; + +import com.unnamed.b.atv.model.TreeNode; +import com.unnamed.b.atv.sample.R; +import com.unnamed.b.atv.sample.holder.TreeItemHolder; +import com.unnamed.b.atv.view.AndroidTreeView; + +import java.text.SimpleDateFormat; +import java.util.Date; + +/** + * @author wxmgcs@gmail.com + * @create 2020-04-28 下午9:33 + */ +public class ShootFragment extends Fragment { + private AndroidTreeView tView; + static SimpleDateFormat nowFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setHasOptionsMenu(true); + } + + public static String now() { + Date now = new Date(); + return nowFormat.format(now); + } + + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + + View rootView = inflater.inflate(R.layout.fragment_shoot, null, false); + ViewGroup containerView = (ViewGroup) rootView.findViewById(R.id.container); + + TreeNode root = TreeNode.root(); + TreeNode scene1Node = new TreeNode(new TreeItemHolder.TreeItem("公共区域-会议室",now())); + + TreeNode image1 = new TreeNode(new TreeItemHolder.TreeItem(1,"DSC_0000.NEF",now())); + TreeNode image2 = new TreeNode(new TreeItemHolder.TreeItem(2,"DSC_0001.NEF",now())); + TreeNode image3 = new TreeNode(new TreeItemHolder.TreeItem(3,"DSC_0002.NEF",now())); + scene1Node.addChildren(image1); + scene1Node.addChildren(image2); + scene1Node.addChildren(image3); + + TreeNode scene2Node = new TreeNode(new TreeItemHolder.TreeItem("公共区域-会议室2",now())); + + TreeNode photo1 = new TreeNode(new TreeItemHolder.TreeItem(1,"DSC_0004.NEF",now())); + TreeNode photo2 = new TreeNode(new TreeItemHolder.TreeItem(2,"DSC_0005.NEF",now())); + TreeNode photo3 = new TreeNode(new TreeItemHolder.TreeItem(3,"DSC_0006.NEF",now())); + + scene2Node.addChildren(photo1, photo2, photo3); + + root.addChildren(scene1Node); + root.addChildren(scene2Node); + + tView = new AndroidTreeView(getActivity(), root); + tView.setDefaultAnimation(false); + tView.setDefaultContainerStyle(R.style.TreeNodeStyleCustom); + tView.setDefaultViewHolder(TreeItemHolder.class); + tView.setDefaultNodeClickListener(nodeClickListener); + tView.setDefaultNodeLongClickListener(nodeLongClickListener); + + containerView.addView(tView.getView()); + + if (savedInstanceState != null) { + String state = savedInstanceState.getString("tState"); + if (!TextUtils.isEmpty(state)) { + tView.restoreState(state); + } + } + + return rootView; + } + + + + @Override + public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { + inflater.inflate(R.menu.menu, menu); + super.onCreateOptionsMenu(menu, inflater); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case R.id.expandAll: + tView.expandAll(); + break; + + case R.id.collapseAll: + tView.collapseAll(); + break; + } + return true; + } + + private TreeNode.TreeNodeClickListener nodeClickListener = new TreeNode.TreeNodeClickListener() { + @Override + public void onClick(TreeNode node, Object value) { + TreeItemHolder.TreeItem item = (TreeItemHolder.TreeItem) value; + if(item.id != 0){ + Toast.makeText(getActivity(),"点击了:"+item.text,Toast.LENGTH_SHORT).show(); + } + + } + }; + + private TreeNode.TreeNodeLongClickListener nodeLongClickListener = + new TreeNode.TreeNodeLongClickListener() { + @Override + public boolean onLongClick(TreeNode node, Object value) { + TreeItemHolder.TreeItem item = (TreeItemHolder.TreeItem) value; + Toast.makeText(getActivity(), "Long click: " + item.text, Toast.LENGTH_SHORT).show(); + return true; + } + }; + + @Override + public void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + outState.putString("tState", tView.getSaveState()); + } +} diff --git a/app/src/main/java/com/unnamed/b/atv/sample/fragment/ShootHistoryFragment.java b/app/src/main/java/com/unnamed/b/atv/sample/fragment/ShootHistoryFragment.java new file mode 100644 index 0000000..4e0ee20 --- /dev/null +++ b/app/src/main/java/com/unnamed/b/atv/sample/fragment/ShootHistoryFragment.java @@ -0,0 +1,139 @@ +package com.unnamed.b.atv.sample.fragment; + +import android.app.Fragment; +import android.os.Bundle; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; +import android.widget.Toast; + +import com.unnamed.b.atv.model.TreeNode; +import com.unnamed.b.atv.sample.R; +import com.unnamed.b.atv.sample.holder.SelectableItemHolder; +import com.unnamed.b.atv.sample.holder.TreeItemHolder; +import com.unnamed.b.atv.view.AndroidTreeView; + +import java.text.SimpleDateFormat; +import java.util.Date; + +/** + * 历史任务 + * @author wxmgcs@gmail.com + * @create 2020-04-28 下午9:34 + */ +public class ShootHistoryFragment extends Fragment { + private TextView statusBar; + private AndroidTreeView tView; + static SimpleDateFormat nowFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + + public static String now() { + Date now = new Date(); + return nowFormat.format(now); + } + + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setHasOptionsMenu(true); + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + + View rootView = inflater.inflate(R.layout.fragment_default, null, false); + ViewGroup containerView = (ViewGroup) rootView.findViewById(R.id.container); + + statusBar = (TextView) rootView.findViewById(R.id.status_bar); + + TreeNode root = TreeNode.root(); + TreeNode computerRoot = new TreeNode(new TreeItemHolder.TreeItem("任务名","时间")); + + TreeNode myDocuments = new TreeNode(new TreeItemHolder.TreeItem("地点-场景-时间","时间")); + TreeNode file1 = new TreeNode(new TreeItemHolder.TreeItem(1,"Folder 1","1")); + TreeNode file2 = new TreeNode(new TreeItemHolder.TreeItem(2, "Folder 2",now())); + TreeNode file3 = new TreeNode(new TreeItemHolder.TreeItem(3, "Folder 3",now())); + TreeNode file4 = new TreeNode(new TreeItemHolder.TreeItem(4, "Folder 4",now())); + myDocuments.addChildren(file1, file2, file3, file4); + + TreeNode myMedia = new TreeNode(new TreeItemHolder.TreeItem("地点-场景-时间",now())); + TreeNode file11 = new TreeNode("File1").setViewHolder(new SelectableItemHolder(getActivity())); + TreeNode file21 = new TreeNode("File2").setViewHolder(new SelectableItemHolder(getActivity())); + TreeNode file31 = new TreeNode("File3").setViewHolder(new SelectableItemHolder(getActivity())); + myMedia.addChildren(file11, file21, file31); + + + computerRoot.addChildren(myDocuments, myMedia); + + root.addChildren(computerRoot); + + tView = new AndroidTreeView(getActivity(), root); + tView.setDefaultAnimation(true); + tView.setDefaultContainerStyle(R.style.TreeNodeStyleCustom); + tView.setDefaultViewHolder(TreeItemHolder.class); + tView.setDefaultNodeClickListener(nodeClickListener); + tView.setDefaultNodeLongClickListener(nodeLongClickListener); + + containerView.addView(tView.getView()); + + if (savedInstanceState != null) { + String state = savedInstanceState.getString("tState"); + if (!TextUtils.isEmpty(state)) { + tView.restoreState(state); + } + } + + return rootView; + } + + @Override + public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { + inflater.inflate(R.menu.menu, menu); + super.onCreateOptionsMenu(menu, inflater); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case R.id.expandAll: + tView.expandAll(); + break; + + case R.id.collapseAll: + tView.collapseAll(); + break; + } + return true; + } + + private int counter = 0; + + private TreeNode.TreeNodeClickListener nodeClickListener = new TreeNode.TreeNodeClickListener() { + @Override + public void onClick(TreeNode node, Object value) { + TreeItemHolder.TreeItem item = (TreeItemHolder.TreeItem) value; + statusBar.setText("Last clicked: " + item.text); + } + }; + + private TreeNode.TreeNodeLongClickListener nodeLongClickListener = new TreeNode.TreeNodeLongClickListener() { + @Override + public boolean onLongClick(TreeNode node, Object value) { + TreeItemHolder.TreeItem item = (TreeItemHolder.TreeItem) value; + Toast.makeText(getActivity(), "Long click: " + item.text, Toast.LENGTH_SHORT).show(); + return true; + } + }; + + @Override + public void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + outState.putString("tState", tView.getSaveState()); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/unnamed/b/atv/sample/holder/TreeItemHolder.java b/app/src/main/java/com/unnamed/b/atv/sample/holder/TreeItemHolder.java new file mode 100644 index 0000000..c2bfb3d --- /dev/null +++ b/app/src/main/java/com/unnamed/b/atv/sample/holder/TreeItemHolder.java @@ -0,0 +1,75 @@ +package com.unnamed.b.atv.sample.holder; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.TextView; + +import com.github.johnkil.print.PrintView; +import com.unnamed.b.atv.model.TreeNode; +import com.unnamed.b.atv.sample.R; + +/** + * @author wxmgcs@gmail.com + * @create 2020-04-28 下午9:33 + */ +public class TreeItemHolder extends TreeNode.BaseNodeViewHolder { + private TextView tvValue; + private PrintView arrowView; + + public TreeItemHolder(Context context) { + super(context); + } + + @Override + public View createNodeView(final TreeNode node, TreeItem value) { + final LayoutInflater inflater = LayoutInflater.from(context); + final View view = inflater.inflate(R.layout.layout_node, null, false); + tvValue = (TextView) view.findViewById(R.id.node_value); + + + if (node.getLevel() == 1) { + tvValue.setText(value.text+"("+value.timestamp+")"); + }else{ + tvValue.setText(String.format("%s. \t%s\t\t%s",value.id,value.text,value.timestamp)); + } + + arrowView = (PrintView) view.findViewById(R.id.arrow_icon); + + view.findViewById(R.id.btn_delete).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + getTreeView().removeNode(node); + } + }); + + + if (node.getLevel() != 1) { + view.findViewById(R.id.arrow_icon).setVisibility(View.GONE); + } + + return view; + } + + @Override + public void toggle(boolean active) { + arrowView.setIconText(context.getResources().getString(active ? R.string.ic_keyboard_arrow_down : R.string.ic_keyboard_arrow_right)); + } + + public static class TreeItem { + public int id = 0; + public String text; + public String timestamp; + + public TreeItem(int id,String text,String timestamp) { + this.id = id; + this.text = text; + this.timestamp = timestamp; + } + + public TreeItem(String text,String timestamp) { + this.text = text; + this.timestamp = timestamp; + } + } +} diff --git a/app/src/main/res/layout/fragment_shoot.xml b/app/src/main/res/layout/fragment_shoot.xml new file mode 100644 index 0000000..216252f --- /dev/null +++ b/app/src/main/res/layout/fragment_shoot.xml @@ -0,0 +1,14 @@ + + + + + + + diff --git a/app/src/main/res/layout/layout_node.xml b/app/src/main/res/layout/layout_node.xml new file mode 100644 index 0000000..bb51cd8 --- /dev/null +++ b/app/src/main/res/layout/layout_node.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build.gradle b/build.gradle index ebf706b..876a06b 100644 --- a/build.gradle +++ b/build.gradle @@ -2,10 +2,11 @@ buildscript { repositories { + maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'} jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.0.0' + classpath 'com.android.tools.build:gradle:3.0.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -21,6 +22,7 @@ allprojects { group = GROUP repositories { + maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'} jcenter() } } diff --git a/gradle.properties b/gradle.properties index ddb8205..0eba815 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,9 +22,9 @@ VERSION_CODE=11 ANDROID_BUILD_MIN_SDK_VERSION=11 -ANDROID_BUILD_TARGET_SDK_VERSION=21 -ANDROID_BUILD_SDK_VERSION=21 -ANDROID_BUILD_TOOLS_VERSION=21.1.2 +ANDROID_BUILD_TARGET_SDK_VERSION=26 +ANDROID_BUILD_SDK_VERSION=28 +ANDROID_BUILD_TOOLS_VERSION=28 GROUP=com.github.bmelnychuk POM_DESCRIPTION=Tree View implementation for android diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0c71e76..649480d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip diff --git a/library/build.gradle b/library/build.gradle index 92ecb9f..867a6ad 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -22,4 +22,4 @@ dependencies { compile 'com.android.support:appcompat-v7:21.0.3' } -apply from: '../maven_push.gradle' +//apply from: '../maven_push.gradle'