CNLive Android Team / OPenCNLive_BaseLib · Commits

Commit 71af6396317fc5ae43c516e46ed38a26af1ca62f

Authored by 朱显松
1 parent c57c4682

Repair the merge code

Inline Side-by-side
Showing 2 changed files with 20 additions and 19 deletions
app/src/main/java/com/cnlive/libs/demo/MainActivity.java
  View file @71af639
... ... @@ -3,7 +3,6 @@ package com.cnlive.libs.demo;
3 3 import android.content.Intent;
4 4 import android.os.Bundle;
5 5 import android.support.v7.app.AppCompatActivity;
6   -import android.view.View;
7 6  
8 7 import com.cnlive.libs.demo.mvptest.ui.activity.LceTestActivity;
9 8  
... ... @@ -16,15 +15,10 @@ public class MainActivity extends AppCompatActivity {
16 15 setContentView(R.layout.activity_main);
17 16  
18 17 //Toast 测试
19   - ToastTest.test(this);
  18 + ToastTest.showMainToast(this,"测试~");
20 19  
21 20 Java8Test.test(this);
22 21  
23   - findViewById(R.id.lce_test).setOnClickListener(new View.OnClickListener() {
24   - @Override
25   - public void onClick(View view) {
26   - startActivity(new Intent(MainActivity.this, LceTestActivity.class));
27   - }
28   - });
  22 + findViewById(R.id.lce_test).setOnClickListener(view -> startActivity(new Intent(MainActivity.this, LceTestActivity.class)));
29 23 }
30 24 }
... ...
app/src/main/res/layout/activity_main.xml
  View file @71af639
... ... @@ -6,20 +6,27 @@
6 6 android:layout_height="match_parent"
7 7 tools:context="com.cnlive.libs.demo.MainActivity">
8 8  
9   - <!--<TextView-->
10   - <!--android:id="@+id/textView"-->
11   - <!--android:layout_width="wrap_content"-->
12   - <!--android:layout_height="wrap_content"-->
13   - <!--android:text="Hello World!"-->
14   - <!--app:layout_constraintBottom_toBottomOf="parent"-->
15   - <!--app:layout_constraintLeft_toLeftOf="parent"-->
16   - <!--app:layout_constraintRight_toRightOf="parent"-->
17   - <!--app:layout_constraintTop_toTopOf="parent" />-->
  9 + <TextView
  10 + android:id="@+id/textView"
  11 + android:layout_width="wrap_content"
  12 + android:layout_height="wrap_content"
  13 + android:text="Hello World!"
  14 + android:padding="8dp"
  15 + app:layout_constraintBottom_toBottomOf="parent"
  16 + app:layout_constraintLeft_toLeftOf="parent"
  17 + app:layout_constraintRight_toRightOf="parent"
  18 + app:layout_constraintTop_toTopOf="parent" />
18 19  
19 20 <Button
20 21 android:id="@+id/lce_test"
21   - android:layout_width="match_parent"
  22 + android:layout_width="368dp"
22 23 android:layout_height="wrap_content"
23   - android:text="Lce Test" />
  24 + android:text="Lce Test"
  25 + app:layout_constraintTop_toTopOf="parent"
  26 + android:layout_marginTop="8dp"
  27 + android:layout_marginLeft="8dp"
  28 + app:layout_constraintLeft_toLeftOf="parent"
  29 + android:layout_marginRight="8dp"
  30 + app:layout_constraintRight_toRightOf="parent" />
24 31  
25 32 </android.support.constraint.ConstraintLayout>
... ...