Skip to content

Commit edca2a9

Browse files
committed
README.md
README.md
1 parent b3145fd commit edca2a9

File tree

9 files changed

+79
-49
lines changed

9 files changed

+79
-49
lines changed

.DS_Store

6 KB
Binary file not shown.

LockTableViewProject/.idea/inspectionProfiles/Project_Default.xml

Lines changed: 36 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

LockTableViewProject/.idea/misc.xml

Lines changed: 1 addition & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

LockTableViewProject/app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
applicationId "com.rmondjone.locktableviewproject"
99
minSdkVersion 19
1010
targetSdkVersion 25
11-
versionCode 10
12-
versionName "1.1.0"
11+
versionCode 11
12+
versionName "1.1.1"
1313
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1414
}
1515
dexOptions {
@@ -36,6 +36,6 @@ dependencies {
3636
})
3737
compile 'com.android.support:appcompat-v7:25.0.0'
3838
testCompile 'junit:junit:4.12'
39-
// compile project(':locktableview')
40-
compile 'com.github.RmondJone:LockTableView:1.1.0'
39+
compile project(':locktableview')
40+
// compile 'com.github.RmondJone:LockTableView:1.1.1'
4141
}

LockTableViewProject/app/src/main/java/com/rmondjone/locktableviewproject/MainActivity.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ protected void onCreate(Bundle savedInstanceState) {
5252
.setLockFristRow(true) //是否锁定第一行
5353
.setMaxColumnWidth(100) //列最大宽度
5454
.setMinColumnWidth(60) //列最小宽度
55-
.setColumnWidth(1,60) //设置指定列文本宽度
55+
.setColumnWidth(1,30) //设置指定列文本宽度
56+
.setColumnWidth(2,20)
5657
.setMinRowHeight(20)//行最小高度
5758
.setMaxRowHeight(60)//行最大高度
5859
.setTextViewSize(16) //单元格字体大小
@@ -80,6 +81,7 @@ public void onRight(HorizontalScrollView view) {
8081
.setOnLoadingListener(new LockTableView.OnLoadingListener() {
8182
@Override
8283
public void onRefresh(final XRecyclerView mXRecyclerView, final ArrayList<ArrayList<String>> mTableDatas) {
84+
Log.e("onRefresh",Thread.currentThread().toString());
8385
Handler handler = new Handler();
8486
handler.postDelayed(new Runnable() {
8587
@Override
@@ -109,6 +111,7 @@ public void run() {
109111

110112
@Override
111113
public void onLoadMore(final XRecyclerView mXRecyclerView, final ArrayList<ArrayList<String>> mTableDatas) {
114+
Log.e("onLoadMore",Thread.currentThread().toString());
112115
Handler handler = new Handler();
113116
handler.postDelayed(new Runnable() {
114117
@Override

LockTableViewProject/locktableview/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
defaultConfig {
99
minSdkVersion 11
1010
targetSdkVersion 25
11-
versionCode 6
12-
versionName "1.0.6"
11+
versionCode 11
12+
versionName "1.1.1"
1313

1414
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1515

LockTableViewProject/locktableview/src/main/java/com/rmondjone/locktableview/LockTableView.java

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,13 @@
2626
import com.rmondjone.xrecyclerview.ProgressStyle;
2727
import com.rmondjone.xrecyclerview.XRecyclerView;
2828

29+
import java.lang.reflect.Array;
2930
import java.util.ArrayList;
31+
import java.util.Collections;
32+
import java.util.HashMap;
33+
import java.util.Iterator;
3034
import java.util.List;
35+
import java.util.Map;
3136

3237
/**
3338
* 说明 可锁定首行和首列的表格视图
@@ -122,6 +127,10 @@ public class LockTableView {
122127
* Item选中样式
123128
*/
124129
private int mOnItemSeletor;
130+
/**
131+
* 要改变的列集合
132+
*/
133+
private HashMap<Integer, Integer> mChangeColumns = new HashMap<>();
125134

126135

127136
//表格数据
@@ -184,14 +193,6 @@ public class LockTableView {
184193
* 列表适配器
185194
*/
186195
private TableViewAdapter mTableViewAdapter;
187-
/**
188-
* 指定要改变列数
189-
*/
190-
private int mColumnNum = -1;
191-
/**
192-
* 指定要改变的列宽度(dp)
193-
*/
194-
private int mColumnWidth = -1;
195196

196197

197198
/**
@@ -304,8 +305,10 @@ private void initData() {
304305
// Log.e("第"+i+"行列最大宽度",buffer.toString());
305306
}
306307
//如果用户指定某列宽度则按照用户指定宽度算
307-
if (mColumnNum >= 0 && mColumnWidth > 0) {
308-
changeColumnWidth(mColumnNum, mColumnWidth);
308+
if (mChangeColumns.size() > 0) {
309+
for (Integer key : mChangeColumns.keySet()) {
310+
changeColumnWidth(key, mChangeColumns.get(key));
311+
}
309312
}
310313
// Log.e("每列最大宽度dp:",mColumnMaxWidths.toString());
311314

@@ -328,8 +331,8 @@ private void initData() {
328331
for (int j = 0; j < rowDatas.size(); j++) {
329332
int currentHeight;
330333
//如果用户指定某列宽度则按照用户指定宽度算对应列的高度
331-
if (j == mColumnNum && mColumnWidth > 0) {
332-
currentHeight = getTextViewHeight(textView, rowDatas.get(j), mColumnWidth);
334+
if (mChangeColumns.size() > 0 && mChangeColumns.containsKey(j)) {
335+
currentHeight = getTextViewHeight(textView, rowDatas.get(j), mChangeColumns.get(j));
333336
} else {
334337
currentHeight = measureTextHeight(textView, rowDatas.get(j));
335338
}
@@ -831,8 +834,11 @@ public LockTableView setOnItemSeletor(int mOnItemSeletor) {
831834
* @return
832835
*/
833836
public LockTableView setColumnWidth(int mColumnNum, int mColumnWidth) {
834-
this.mColumnNum = mColumnNum;
835-
this.mColumnWidth = mColumnWidth;
837+
//判断是否已经设置过
838+
if (mChangeColumns.containsKey(mColumnNum)) {
839+
mChangeColumns.remove(mColumnNum);
840+
}
841+
mChangeColumns.put(mColumnNum, mColumnWidth);
836842
return this;
837843
}
838844

LockTableViewProject/locktableview/src/main/java/com/rmondjone/locktableview/TableViewAdapter.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -207,13 +207,15 @@ public void onItemSelected(View view, int position) {
207207
mUnLockAdapter.setOnItemSelectedListenter(new OnItemSelectedListenter() {
208208
@Override
209209
public void onItemSelected(View view, int position) {
210-
RecyclerView.LayoutManager mLockLayoutManager = holder.mLockRecyclerView.getLayoutManager();
211-
int itemCount=mLockLayoutManager.getItemCount();
212-
View item=mLockLayoutManager.getChildAt(position);
213-
item.setBackgroundColor(ContextCompat.getColor(mContext,mOnItemSeletor));
214-
for(int i=0;i<itemCount;i++){
215-
if(i!=position){
216-
mLockLayoutManager.getChildAt(i).setBackgroundColor(Color.TRANSPARENT);
210+
if(isLockColumn){
211+
RecyclerView.LayoutManager mLockLayoutManager = holder.mLockRecyclerView.getLayoutManager();
212+
int itemCount=mLockLayoutManager.getItemCount();
213+
View item=mLockLayoutManager.getChildAt(position);
214+
item.setBackgroundColor(ContextCompat.getColor(mContext,mOnItemSeletor));
215+
for(int i=0;i<itemCount;i++){
216+
if(i!=position){
217+
mLockLayoutManager.getChildAt(i).setBackgroundColor(Color.TRANSPARENT);
218+
}
217219
}
218220
}
219221
RecyclerView.LayoutManager mUnLockLayoutManager = holder.mMainRecyclerView.getLayoutManager();

README.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ repositories {
2929
* 第二步
3030
```java
3131
dependencies {
32-
compile 'com.github.RmondJone:LockTableView:1.1.0'
32+
compile 'com.github.RmondJone:LockTableView:1.1.1'
3333
}
3434
```
3535

@@ -205,13 +205,9 @@ private OnItemLongClickListenter mOnItemLongClickListenter;
205205
*/
206206
private int mOnItemSeletor;
207207
/**
208-
* 指定要改变列数
208+
* 要改变的列集合
209209
*/
210-
private int mColumnNum = -1;
211-
/**
212-
* 指定要改变的列宽度(dp)
213-
*/
214-
private int mColumnWidth = -1;
210+
private HashMap<Integer, Integer> mChangeColumns = new HashMap<>();
215211

216212

217213
```

0 commit comments

Comments
 (0)