Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/res/layout/activity_main.xml
master
hanxueqing 6 years ago
parent 26286fce89
commit 240ea0e25d

@ -1,9 +1,14 @@
package com.example.cmknowledgegraph; package com.example.cmknowledgegraph;
import android.graphics.Typeface;
import android.os.Bundle; import android.os.Bundle;
import android.util.TypedValue;
import android.widget.TextView;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import com.example.PersonalCenter.SearchServiceGet;
public class SearchContentActivity extends AppCompatActivity { public class SearchContentActivity extends AppCompatActivity {
/** /**
@ -16,6 +21,19 @@ public class SearchContentActivity extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_search_content); setContentView(R.layout.activity_search_content);
TextView text_title=findViewById(R.id.search_content);
//设置内容的标题,位置,大小
String label_name=getIntent().getStringExtra("label").toString();
text_title.setPadding(50,80,100,100);
text_title.setText(label_name);
text_title.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16);
text_title.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
//遍历label和content的队列显示内容
for(int i=1;i< SearchServiceGet.label.size();i++){
}
} }

@ -38,9 +38,6 @@ public class SearchEntryActivity extends AppCompatActivity {
startActivity(intent); startActivity(intent);
break; break;
} }
} }
}); });
lv.setAdapter(adapter); lv.setAdapter(adapter);

@ -9,6 +9,7 @@
<TextView <TextView
android:id="@+id/search_content" android:id="@+id/search_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"
/>
</LinearLayout> </LinearLayout>
Loading…
Cancel
Save