Repair the merge code

朱显松
1 parent c57c4682
Showing 2 changed files with 20 additions and 19 deletions
app/src/main/java/com/cnlive/libs/demo/MainActivity.java
app/src/main/res/layout/activity_main.xml
@@ -3,7 +3,6 @@ package com.cnlive.libs.demo;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
-import android.view.View;
 import com.cnlive.libs.demo.mvptest.ui.activity.LceTestActivity;
@@ -16,15 +15,10 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
         //Toast 测试
-        ToastTest.test(this);
+        ToastTest.showMainToast(this,"测试~");
         Java8Test.test(this);
-        findViewById(R.id.lce_test).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                startActivity(new Intent(MainActivity.this, LceTestActivity.class));
-            }
-        });
+        findViewById(R.id.lce_test).setOnClickListener(view -> startActivity(new Intent(MainActivity.this, LceTestActivity.class)));
     }
 }
@@ -6,20 +6,27 @@
     android:layout_height="match_parent"
     tools:context="com.cnlive.libs.demo.MainActivity">
-    <!--<TextView-->
-        <!--android:id="@+id/textView"-->
-        <!--android:layout_width="wrap_content"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:text="Hello World!"-->
-        <!--app:layout_constraintBottom_toBottomOf="parent"-->
-        <!--app:layout_constraintLeft_toLeftOf="parent"-->
-        <!--app:layout_constraintRight_toRightOf="parent"-->
-        <!--app:layout_constraintTop_toTopOf="parent" />-->
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Hello World!"
+        android:padding="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
     <Button
         android:id="@+id/lce_test"
-        android:layout_width="match_parent"
+        android:layout_width="368dp"
         android:layout_height="wrap_content"
-        android:text="Lce  Test" />
+        android:text="Lce  Test"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginTop="8dp"
+        android:layout_marginLeft="8dp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:layout_marginRight="8dp"
+        app:layout_constraintRight_toRightOf="parent" />
 </android.support.constraint.ConstraintLayout>