Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/res/layout/activity_main.xml
ongbodev
哈哈哈哈哈士奇 6 years ago
commit 6cf65e6f7b

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RenderSettings">
<option name="showDecorations" value="true" />
</component>
</project>

@ -26,4 +26,5 @@ dependencies {
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
api 'com.hankcs:hanlp:portable-1.7.2'
}

@ -9,6 +9,7 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".PersonalityCenterActivity" />
<activity android:name=".MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

@ -0,0 +1,37 @@
package com.example.cmknowledgegraph;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import androidx.appcompat.app.AppCompatActivity;
public class LoginActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_login);
final EditText tel_edit=findViewById(R.id.id_edit);
final EditText password_edit=findViewById(R.id.password_edit);
/**
* (int)(string)
*/
Button login_btn=findViewById(R.id.login_btn);
login_btn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
//获取手机号和密码
String tel=tel_edit.getText().toString().trim();
String password=password_edit.getText().toString();
//调用数据库类中的方法进行登录
}
});
}
}

@ -4,12 +4,16 @@ import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import com.hankcs.hanlp.HanLP;
public class MainActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
System.out.println("hello");
System.out.println(HanLP.segment("你好欢迎使用HanLP汉语处理包"));
System.out.println("haha");
}
}

@ -0,0 +1,13 @@
package com.example.cmknowledgegraph;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
public class PersonalityCenterActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_personality_center);
}
}

@ -0,0 +1,36 @@
package com.example.cmknowledgegraph;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import androidx.appcompat.app.AppCompatActivity;
public class RegisterActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_register);
final EditText tel_edit=findViewById(R.id.tel_register_edit);
final EditText password_edit=findViewById(R.id.password_edit);
final EditText nickname_edit=findViewById(R.id.nickname_register_edit);
/**
* int(string)(string)
*/
Button register =findViewById(R.id.register_btn);
register.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
//获取手机号,密码,昵称
String tel=tel_edit.getText().toString().trim();
String password=password_edit.getText().toString();
String NickName=nickname_edit.getText().toString();
//调用数据库类方法进行注册
}
});
}
}

@ -0,0 +1,14 @@
package com.example.cmknowledgegraph;
import android.os.Bundle;
import androidx.appcompat.app.AppCompatActivity;
public class SearchActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_search);
}
}

@ -0,0 +1,19 @@
package com.example.cmknowledgegraph;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.fragment.app.Fragment;
public class SearchContent extends Fragment {
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
return inflater.inflate( R.layout.activity_search, container, false ); //要加载的layout文件
}
}

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M3,13h8L11,3L3,3v10zM3,21h8v-6L3,15v6zM13,21h8L21,11h-8v10zM13,3v6h8L21,3h-8z" />
</vector>

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />
</vector>

@ -0,0 +1,170 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:fillColor="#008577"
android:pathData="M0,0h108v108h-108z" />
<path
android:fillColor="#00000000"
android:pathData="M9,0L9,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,0L19,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M29,0L29,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M39,0L39,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M49,0L49,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M59,0L59,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M69,0L69,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M79,0L79,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M89,0L89,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M99,0L99,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,9L108,9"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,19L108,19"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,29L108,29"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,39L108,39"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,49L108,49"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,59L108,59"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,69L108,69"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,79L108,79"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,89L108,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,99L108,99"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,29L89,29"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,39L89,39"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,49L89,49"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,59L89,59"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,69L89,69"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,79L89,79"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M29,19L29,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M39,19L39,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M49,19L49,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M59,19L59,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M69,19L69,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M79,19L79,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
</vector>

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z" />
</vector>

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

@ -0,0 +1,90 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".LoginActivity">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="80dp"
android:layout_marginLeft="60dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="账号"
android:layout_marginTop="10dp"
android:layout_marginLeft="10dp"
android:textSize="20dp"
android:textColor="#8B4513"/>
<EditText
android:id="@+id/id_edit"
android:layout_width="250dp"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginLeft="10dp"
android:inputType="number"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginLeft="60dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="密码"
android:layout_marginTop="10dp"
android:layout_marginLeft="10dp"
android:textSize="20dp"
android:textColor="#8B4513"/>
<EditText
android:id="@+id/password_edit"
android:layout_width="250dp"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginLeft="10dp"
android:inputType="textPassword"/>
</LinearLayout>
<Button
android:id="@+id/login_btn"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:text="登录"
android:textSize="20dp"
android:background="#FFDAB9"
android:layout_marginTop="30dp"
android:layout_marginLeft="70dp"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="忘记密码?"
android:textSize="15dp"
android:layout_marginTop="10dp"
android:layout_marginLeft="70dp"
android:textColor="#8B4513"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="注册"
android:textSize="17dp"
android:layout_marginTop="10dp"
android:layout_marginLeft="180dp"
android:textColor="#8B4513"/>
</LinearLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/login_pic"/>
</LinearLayout>

@ -0,0 +1,202 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".PersonalityCenterActivity">
<ImageView
android:id="@+id/head_picture"
android:layout_width="110dp"
android:layout_height="110dp"
android:layout_marginTop="20dp"
android:layout_marginLeft="150dp"
android:layout_centerInParent="true"
android:src="@mipmap/picture"/>
<Button
android:id="@+id/login_button"
android:layout_width="100dp"
android:layout_height="50dp"
android:text="登录"
android:textSize="20sp"
android:layout_marginLeft="157dp"/>
<View
android:layout_marginTop="20dp"
android:layout_height="1px"
android:background="#000000"
android:layout_width="fill_parent"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:id="@+id/yellow_star1"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginLeft="2dp"
android:src="@mipmap/star"/>
<TextView
android:id="@+id/personal"
android:layout_width="100dp"
android:layout_height="40dp"
android:text="个性推荐"
android:textSize="18sp"
android:layout_marginTop="12dp"
android:layout_marginLeft="16dp"/>
</LinearLayout>
<View
android:layout_height="1px"
android:background="#000000"
android:layout_width="fill_parent"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:id="@+id/yellow_star2"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginLeft="2dp"
android:src="@mipmap/star"/>
<TextView
android:id="@+id/diet_hobby"
android:layout_width="100dp"
android:layout_height="40dp"
android:text="饮食爱好"
android:textSize="18sp"
android:layout_marginTop="12dp"
android:layout_marginLeft="16dp"/>
</LinearLayout>
<View
android:layout_height="1px"
android:background="#000000"
android:layout_width="fill_parent"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:id="@+id/yellow_star3"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginLeft="2dp"
android:src="@mipmap/star"/>
<TextView
android:id="@+id/regimen"
android:layout_width="100dp"
android:layout_height="40dp"
android:text="养生方案"
android:textSize="18sp"
android:layout_marginTop="12dp"
android:layout_marginLeft="16dp"/>
</LinearLayout>
<View
android:layout_height="1px"
android:background="#000000"
android:layout_width="fill_parent"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:id="@+id/yellow_star4"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginLeft="2dp"
android:src="@mipmap/star"/>
<TextView
android:id="@+id/history"
android:layout_width="100dp"
android:layout_height="40dp"
android:text="浏览记录"
android:textSize="18sp"
android:layout_marginTop="12dp"
android:layout_marginLeft="16dp"/>
</LinearLayout>
<View
android:layout_height="1px"
android:background="#000000"
android:layout_width="fill_parent"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:id="@+id/yellow_star5"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginLeft="2dp"
android:src="@mipmap/star"/>
<TextView
android:id="@+id/message"
android:layout_width="100dp"
android:layout_height="40dp"
android:text="消息通知"
android:textSize="18sp"
android:layout_marginTop="12dp"
android:layout_marginLeft="16dp"/>
</LinearLayout>
<View
android:layout_height="1px"
android:background="#000000"
android:layout_width="fill_parent"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:id="@+id/yellow_star6"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginLeft="2dp"
android:src="@mipmap/star"/>
<TextView
android:id="@+id/setting"
android:layout_width="100dp"
android:layout_height="40dp"
android:text="设置"
android:textSize="18sp"
android:layout_marginTop="12dp"
android:layout_marginLeft="16dp"/>
</LinearLayout>
<View
android:layout_height="1px"
android:background="#000000"
android:layout_width="fill_parent"/>
</LinearLayout>

@ -0,0 +1,76 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".RegisterActivity">
<GridLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:rowCount="3"
android:columnCount="2"
android:layout_marginTop="80dp"
android:layout_marginLeft="60dp"
>
<TextView
android:text="手机号"
android:layout_marginTop="10dp"
android:layout_marginLeft="10dp"
android:textSize="20dp"
android:textColor="#D2691E"
/>
<EditText
android:id="@+id/tel_register_edit"
android:layout_width="200dp"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"/>
<TextView
android:text="昵称"
android:layout_marginTop="25dp"
android:layout_marginLeft="20dp"
android:textSize="20dp"
android:textColor="#D2691E"
/>
<EditText
android:id="@+id/nickname_register_edit"
android:layout_width="200dp"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginTop="20dp"/>
<TextView
android:text="密 码"
android:layout_marginTop="25dp"
android:layout_marginLeft="10dp"
android:textSize="20dp"
android:textColor="#D2691E"
/>
<EditText
android:id="@+id/password_register_edit"
android:layout_width="200dp"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginTop="20dp"
android:inputType="textPassword"
/>
</GridLayout>
<Button
android:id="@+id/register_btn"
android:layout_width="250dp"
android:layout_height="wrap_content"
android:layout_marginTop="80dp"
android:layout_marginStart="100dp"
android:background="#FFE4C4"
android:layout_marginLeft="5dp"
android:text="注册"
android:textSize="20dp"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/register_pic"
android:layout_marginLeft="150dp"
android:layout_marginTop="60dp"/>
</LinearLayout>

@ -0,0 +1,92 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".SearchActivity">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="101dp">
<EditText
android:layout_width="250dp"
android:layout_height="wrap_content"
android:layout_marginLeft="80dp"
android:layout_marginTop="10dp"
android:paddingBottom="15dp"
android:text="请输入您的搜索词汇"
android:textColor="#C0C0C0"
android:textSize="40px" />
<ImageButton
android:id="@+id/search_btn"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginLeft="10dp"
android:src="@mipmap/search"/>
</LinearLayout>
<GridLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:layout_marginLeft="50dp"
android:columnCount="3"
android:rowCount="2"
android:orientation="horizontal">
<Button
android:id="@+id/btn1"
android:layout_width="wrap_content"
android:layout_height="30dp"
android:layout_marginTop="10dp"
android:layout_marginLeft="10dp"
android:text="食欲不振"
android:background="#FFDEAD"
/>
<Button
android:layout_width="wrap_content"
android:layout_height="30dp"
android:layout_marginTop="10dp"
android:layout_marginLeft="10dp"
android:text="糖尿病"
android:background="#FFDEAD"/>
<Button
android:layout_width="wrap_content"
android:layout_height="30dp"
android:layout_marginTop="10dp"
android:layout_marginLeft="10dp"
android:text="头晕"
android:background="#FFDEAD"/>
<Button
android:layout_width="wrap_content"
android:layout_height="30dp"
android:layout_marginTop="15dp"
android:layout_marginLeft="10dp"
android:text="熬夜掉发"
android:background="#FFDEAD"/>
<Button
android:layout_width="wrap_content"
android:layout_height="30dp"
android:layout_marginTop="15dp"
android:layout_marginLeft="10dp"
android:text="感冒发烧"
android:background="#FFDEAD"/>
<Button
android:layout_width="wrap_content"
android:layout_height="30dp"
android:layout_marginTop="15dp"
android:layout_marginLeft="10dp"
android:text="感冒发烧"
android:background="#FFDEAD"/>
</GridLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/search_back"/>
</LinearLayout>

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Loading…
Cancel
Save