Skip to content

Commit cc2f488

Browse files
committed
调整结构
1 parent 70293d5 commit cc2f488

File tree

6 files changed

+16
-8
lines changed

6 files changed

+16
-8
lines changed

SimpleDropMenu/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,6 @@ dependencies {
3232
androidTestImplementation 'com.android.support.test:runner:1.0.2'
3333
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
3434
}
35+
36+
37+

SimpleDropMenu/src/main/java/com/sss/simpleDropMenu/SimpleDropMenu.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import android.graphics.Color;
88
import android.graphics.Point;
99
import android.os.Build;
10-
import android.support.annotation.NonNull;
1110
import android.text.TextUtils;
1211
import android.util.AttributeSet;
1312
import android.util.TypedValue;
@@ -23,6 +22,8 @@
2322
import android.widget.LinearLayout;
2423
import android.widget.TextView;
2524

25+
import com.sss.simpleDropMenu.bean.TabMenuBean;
26+
2627
import java.util.List;
2728

2829

@@ -184,7 +185,7 @@ public SimpleDropMenu(Context context, AttributeSet attrs, int defStyleAttr) {
184185
* @param popupViews
185186
* @param contentView
186187
*/
187-
public void setDropDownMenu(@NonNull List<TabMenuBean> tabTexts, @NonNull List<View> popupViews, @NonNull View contentView) {
188+
public void setDropDownMenu( List<TabMenuBean> tabTexts, List<View> popupViews, View contentView) {
188189
if (tabTexts.size() != popupViews.size()) {
189190
throw new IllegalArgumentException("params not match, tabTexts.size() should be equal popupViews.size()");
190191
}
@@ -237,7 +238,7 @@ public void onClick(View v) {
237238
* @param tabMenuBean
238239
* @param i
239240
*/
240-
private void addTab(@NonNull final TabMenuBean tabMenuBean, final int i) {
241+
private void addTab(final TabMenuBean tabMenuBean, final int i) {
241242
//tab父容器(包含TextView和ImageView)
242243
LinearLayout tabParent = new LinearLayout(getContext());
243244
tabParent.setOrientation(HORIZONTAL);

SimpleDropMenu/src/main/java/com/sss/simpleDropMenu/TabMenuBean.java renamed to SimpleDropMenu/src/main/java/com/sss/simpleDropMenu/bean/TabMenuBean.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.sss.simpleDropMenu;
1+
package com.sss.simpleDropMenu.bean;
22

33
/**
44
* Created by Administrator on 2018/9/22.

app/src/main/java/com/sss/dropmenu/Example1.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
import android.view.View;
77
import android.widget.ImageView;
88
import android.widget.TextView;
9-
import android.widget.Toast;
109

1110
import com.sss.simpleDropMenu.SimpleDropMenu;
12-
import com.sss.simpleDropMenu.TabMenuBean;
11+
import com.sss.simpleDropMenu.bean.TabMenuBean;
1312

1413
import java.util.ArrayList;
1514
import java.util.List;

app/src/main/java/com/sss/dropmenu/Example2.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import android.widget.TextView;
1010

1111
import com.sss.simpleDropMenu.SimpleDropMenu;
12-
import com.sss.simpleDropMenu.TabMenuBean;
12+
import com.sss.simpleDropMenu.bean.TabMenuBean;
1313

1414
import java.util.ArrayList;
1515
import java.util.List;

build.gradle

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ buildscript {
88
}
99
dependencies {
1010
classpath 'com.android.tools.build:gradle:3.0.1'
11-
11+
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
12+
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
1213

1314
// NOTE: Do not place your application dependencies here; they belong
1415
// in the individual module build.gradle files
@@ -21,6 +22,10 @@ allprojects {
2122
jcenter()
2223
}
2324
}
25+
//最好加上全局编码设置
26+
tasks.withType(JavaCompile) {
27+
options.encoding = 'UTF-8'
28+
}
2429

2530
task clean(type: Delete) {
2631
delete rootProject.buildDir

0 commit comments

Comments
 (0)