diff --git a/app/build.gradle b/app/build.gradle index 04303db..9895554 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,7 +5,7 @@ android { buildToolsVersion "29.0.2" defaultConfig { applicationId "com.example.cmknowledgegraph" - minSdkVersion 16 + minSdkVersion 21 targetSdkVersion 29 versionCode 1 versionName "1.0" @@ -55,5 +55,7 @@ dependencies { implementation 'com.alibaba:fastjson:1.1.71.android' //弹状搜索框 implementation 'com.github.yalantis:jellytoolbar:v1.0' + //个人中心页面设计 + implementation 'com.github.yalantis:Side-Menu.Android:1.0.1' } diff --git a/app/src/main/java/com/example/PersonalCenter/HandlerHandle.java b/app/src/main/java/com/example/PersonalCenter/HandlerHandle.java index fd0b6a5..b911a80 100644 --- a/app/src/main/java/com/example/PersonalCenter/HandlerHandle.java +++ b/app/src/main/java/com/example/PersonalCenter/HandlerHandle.java @@ -21,18 +21,19 @@ public class HandlerHandle extends Handler { public void handleMessage(@NonNull Message msg) { //根据登录状态请求不同的消息 super.handleMessage(msg); - Bundle b = msg.getData(); - String data = b.getString("msg"); - Log.i("haha-====","==="+data); - retuData retuData = JSON.parseObject(data, com.example.tools.retuData.class); - if(retuData.msg.equals("success")){ - //登录成功，返回主页面 - }else{ -// 登录失败 - Toast.makeText(loginActivity, retuData.msg, Toast.LENGTH_SHORT).show(); - - - } +// Bundle b = msg.getData(); +// String data = b.getString("msg"); +// Log.i("haha-====","==="+data); +// +// retuData retuData = JSON.parseObject(data, com.example.tools.retuData.class); +// if(retuData.msg.equals("success")){ +// //登录成功，返回主页面 +// }else{ +//// 登录失败 +// Toast.makeText(loginActivity, retuData.msg, Toast.LENGTH_SHORT).show(); +// +// +// } } } diff --git a/app/src/main/java/com/example/cmknowledgegraph/MainActivity.java b/app/src/main/java/com/example/cmknowledgegraph/MainActivity.java index 4874426..3e3088c 100644 --- a/app/src/main/java/com/example/cmknowledgegraph/MainActivity.java +++ b/app/src/main/java/com/example/cmknowledgegraph/MainActivity.java @@ -2,27 +2,30 @@ package com.example.cmknowledgegraph; import android.os.Bundle; -import com.example.cmknowledgegraph.MainContent; -import com.example.cmknowledgegraph.R; -import com.example.cmknowledgegraph.SearchContent; + import com.google.android.material.bottomnavigation.BottomNavigationView; import com.hankcs.hanlp.HanLP; + import androidx.appcompat.app.AppCompatActivity; -import androidx.annotation.NonNull; + import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; + import android.view.MenuItem; + import android.widget.TextView; -import java.util.List; -public class MainActivity extends AppCompatActivity { +import yalantis.com.sidemenu.util.ViewAnimator; + +public class MainActivity extends AppCompatActivity { private TextView mTextMessage; private FragmentTransaction transaction; private FragmentManager fragmentManager; - AppCompatActivity appCompatActivity; + + public final AppCompatActivity getAppCompatActivity(){ return this; } @@ -61,7 +64,10 @@ public class MainActivity extends AppCompatActivity { transaction.commit();//提交事务 return true; case R.id.person: - transaction.replace(R.id.content,new PersonContent()); //对应的java class + PersonContent personContent = new PersonContent(); + personContent.setAppCompatActivity(getAppCompatActivity()); + transaction.replace(R.id.content, personContent); //对应的java class + transaction.commit(); //提交事务 return true; } diff --git a/app/src/main/java/com/example/cmknowledgegraph/PersonContent.java b/app/src/main/java/com/example/cmknowledgegraph/PersonContent.java index bbacfda..0fcc8cb 100644 --- a/app/src/main/java/com/example/cmknowledgegraph/PersonContent.java +++ b/app/src/main/java/com/example/cmknowledgegraph/PersonContent.java @@ -1,16 +1,43 @@ package com.example.cmknowledgegraph; +import android.app.Person; import android.content.Intent; +import android.graphics.Bitmap; +import android.graphics.Canvas; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; import android.widget.ImageButton; +import android.widget.ImageView; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.Fragment; -public class PersonContent extends Fragment { +import yalantis.com.sidemenu.interfaces.Resourceble; +import yalantis.com.sidemenu.interfaces.ScreenShotable; +import yalantis.com.sidemenu.util.ViewAnimator; + +public class PersonContent extends Fragment { + + + protected int res; + + + + + AppCompatActivity appCompatActivity; + + public AppCompatActivity getAppCompatActivity() { + return appCompatActivity; + } + + public void setAppCompatActivity(AppCompatActivity appCompatActivity) { + this.appCompatActivity = appCompatActivity; + } + public View onCreateView(LayoutInflater inflater, ViewGroup container, @@ -22,15 +49,11 @@ public class PersonContent extends Fragment { public void onActivityCreated(Bundle savedInstanceState) { // TODO Auto-generated method stub super.onActivityCreated(savedInstanceState); + Button login_pc_btn = (Button) getActivity().findViewById(R.id.login_pc_button); login_pc_btn.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - //跳转到LoginActivity -// if(!LoginActivity.isLogin){ -// Intent intent=new Intent(); -// intent.setClass(getActivity(),LoginActivity.class); -// startActivity(intent); -// } + Intent intent=new Intent(); intent.setClass(getActivity(),LoginActivity.class); startActivity(intent); diff --git a/app/src/main/res/drawable/content_films.png b/app/src/main/res/drawable/content_films.png new file mode 100644 index 0000000..3b63ca4 Binary files /dev/null and b/app/src/main/res/drawable/content_films.png differ diff --git a/app/src/main/res/drawable/content_music.png b/app/src/main/res/drawable/content_music.png new file mode 100644 index 0000000..4cb689b Binary files /dev/null and b/app/src/main/res/drawable/content_music.png differ diff --git a/app/src/main/res/drawable/icn_1.png b/app/src/main/res/drawable/icn_1.png new file mode 100644 index 0000000..2e5068b Binary files /dev/null and b/app/src/main/res/drawable/icn_1.png differ diff --git a/app/src/main/res/drawable/icn_2.png b/app/src/main/res/drawable/icn_2.png new file mode 100644 index 0000000..5f261f3 Binary files /dev/null and b/app/src/main/res/drawable/icn_2.png differ diff --git a/app/src/main/res/drawable/icn_3.png b/app/src/main/res/drawable/icn_3.png new file mode 100644 index 0000000..f180732 Binary files /dev/null and b/app/src/main/res/drawable/icn_3.png differ diff --git a/app/src/main/res/drawable/icn_4.png b/app/src/main/res/drawable/icn_4.png new file mode 100644 index 0000000..08d1c4a Binary files /dev/null and b/app/src/main/res/drawable/icn_4.png differ diff --git a/app/src/main/res/drawable/icn_5.png b/app/src/main/res/drawable/icn_5.png new file mode 100644 index 0000000..ea0a849 Binary files /dev/null and b/app/src/main/res/drawable/icn_5.png differ diff --git a/app/src/main/res/drawable/icn_6.png b/app/src/main/res/drawable/icn_6.png new file mode 100644 index 0000000..b0d57f7 Binary files /dev/null and b/app/src/main/res/drawable/icn_6.png differ diff --git a/app/src/main/res/drawable/icn_7.png b/app/src/main/res/drawable/icn_7.png new file mode 100644 index 0000000..2b8a27c Binary files /dev/null and b/app/src/main/res/drawable/icn_7.png differ diff --git a/app/src/main/res/drawable/icn_close.png b/app/src/main/res/drawable/icn_close.png new file mode 100644 index 0000000..16ac207 Binary files /dev/null and b/app/src/main/res/drawable/icn_close.png differ diff --git a/app/src/main/res/layout/activity_personality_center.xml b/app/src/main/res/layout/activity_personality_center.xml index 27e31ae..7dfa9f3 100644 --- a/app/src/main/res/layout/activity_personality_center.xml +++ b/app/src/main/res/layout/activity_personality_center.xml @@ -6,6 +6,7 @@ android:layout_height="match_parent" tools:context=".PersonalityCenterActivity"> + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml new file mode 100644 index 0000000..3ba3fed --- /dev/null +++ b/app/src/main/res/menu/menu_main.xml @@ -0,0 +1,10 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d69df4f..2c5a7a5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,4 +1,7 @@ CMKnowledgeGraph News feed + Settings + Open + Close