From c9aa79684f25eb5b1d9af98eaa9eca0371398174 Mon Sep 17 00:00:00 2001 From: zhangsan <646228430@qq.com> Date: Wed, 15 May 2024 12:14:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E9=A1=B9=E7=9B=AE=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zjgsu/jianshu/ExampleInstrumentedTest.kt | 24 -------- app/src/main/AndroidManifest.xml | 60 +++++++++---------- .../com/zjgsu/jianshu/Activity/testgood.kt | 54 ----------------- .../main/java/com/zjgsu/jianshu/BookAuthor.kt | 3 - .../main/java/com/zjgsu/jianshu/TypeView.kt | 13 ---- .../Activity/AccountManagerActivity.kt | 5 +- .../Activity/Author_introductionActivity.kt | 14 +++-- .../Activity/BookInformationActivity.kt | 14 +++-- .../jianshu/Activity/BookIntroActivity.kt | 5 +- .../jianshu/Activity/BookShelfActivity.kt | 12 ++-- .../whut}/jianshu/Activity/FindpwdActivity.kt | 5 +- .../jianshu/Activity/GoodBookActivity.kt | 8 ++- .../whut}/jianshu/Activity/HotBookActivity.kt | 8 ++- .../jianshu/Activity/LiteratureActivity.kt | 8 ++- .../whut}/jianshu/Activity/LoginActivity.kt | 5 +- .../whut}/jianshu/Activity/MainActivity.kt | 13 ++-- .../jianshu/Activity/ManagementActivity.kt | 8 ++- .../jianshu/Activity/MediaPlayerActivity.java | 6 +- .../whut}/jianshu/Activity/MyActivity.kt | 12 ++-- .../whut}/jianshu/Activity/MyPostActivity.kt | 10 ++-- .../jianshu/Activity/PerceptionActivity.kt | 9 ++- .../Perception_informationActivity.kt | 17 +++--- .../jianshu/Activity/PhilosophyActivity.kt | 8 ++- .../jianshu/Activity/PsychologyActivity.kt | 11 ++-- .../jianshu/Activity/ReAddressActivity.kt | 5 +- .../whut}/jianshu/Activity/ReEmailActivity.kt | 5 +- .../jianshu/Activity/ReMyinfoActivity.kt | 5 +- .../whut}/jianshu/Activity/ReNameActivity.kt | 5 +- .../whut}/jianshu/Activity/RePhoneActivity.kt | 5 +- .../whut}/jianshu/Activity/ReSexActivity.kt | 5 +- .../jianshu/Activity/ReSignatureActivity.kt | 5 +- .../jianshu/Activity/RegisterActivity.kt | 5 +- .../whut}/jianshu/Activity/ScienceActivity.kt | 8 ++- .../jianshu/Activity/SendSpecificActivity.kt | 7 ++- .../Activity/sendPerceptionActivity.kt | 13 ++-- .../whut}/jianshu/Adapter/BillboardAdapter.kt | 7 ++- .../whut}/jianshu/Adapter/BookAdapter.kt | 6 +- .../whut}/jianshu/Adapter/BookAdapter2.kt | 8 ++- .../whut}/jianshu/Adapter/BookRankAdapter.kt | 10 +++- .../jianshu/Adapter/Book_authorAdapter.kt | 11 ++-- .../whut}/jianshu/Adapter/BookshelfAdapter.kt | 7 ++- .../whut}/jianshu/Adapter/CommentAdapter.kt | 10 ++-- .../jianshu/Adapter/GoodperceptionAdapter.kt | 10 ++-- .../jianshu/Adapter/PerceptionAdapter.kt | 13 ++-- .../jianshu/Adapter/send_perceptionAdapter.kt | 4 +- .../whut}/jianshu/AvatarImageView.java | 2 +- .../whut/jianshu/Data/entity}/Author_bmob.kt | 2 +- .../whut/jianshu/Data/entity}/BookShelf.kt | 2 +- .../whut/jianshu/Data/entity}/Book_bmob.kt | 2 +- .../jianshu/Data/entity}/Book_inf_bmob.kt | 2 +- .../jianshu/Data/entity}/Bookcontent_bmob.kt | 2 +- .../whut/jianshu/Data/entity}/Comment_bmob.kt | 2 +- .../jianshu/Data/entity}/Perception_bmob.kt | 2 +- .../whut/jianshu/Data/entity}/User_bmob.kt | 2 +- .../whut/jianshu/Data/vo}/Book.kt | 2 +- .../edu/whut/jianshu/Data/vo/BookAuthor.kt | 3 + .../whut/jianshu/Data/vo}/Book_Shelf.kt | 2 +- .../whut/jianshu/Data/vo}/Book_rank.kt | 2 +- .../whut/jianshu/Data/vo}/Book_video.kt | 2 +- .../whut/jianshu/Data/vo}/Comment.kt | 2 +- .../whut/jianshu/Data/vo}/Perception.kt | 2 +- .../whut}/jianshu/DragableLuncher.java | 2 +- .../whut}/jianshu/Fragment/ContentFragment.kt | 4 +- .../zjgsu => edu/whut}/jianshu/MyDialog.java | 3 +- .../whut}/jianshu/NavigationHelper.kt | 2 +- .../whut}/jianshu/showPopupcomment.java | 2 +- .../java/com/zjgsu/jianshu/ExampleUnitTest.kt | 17 ------ 67 files changed, 258 insertions(+), 291 deletions(-) delete mode 100644 app/src/androidTest/java/com/zjgsu/jianshu/ExampleInstrumentedTest.kt delete mode 100644 app/src/main/java/com/zjgsu/jianshu/Activity/testgood.kt delete mode 100644 app/src/main/java/com/zjgsu/jianshu/BookAuthor.kt delete mode 100644 app/src/main/java/com/zjgsu/jianshu/TypeView.kt rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Activity/AccountManagerActivity.kt (82%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Activity/Author_introductionActivity.kt (90%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Activity/BookInformationActivity.kt (97%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Activity/BookIntroActivity.kt (94%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Activity/BookShelfActivity.kt (96%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Activity/FindpwdActivity.kt (96%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Activity/GoodBookActivity.kt (95%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Activity/HotBookActivity.kt (94%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Activity/LiteratureActivity.kt (95%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Activity/LoginActivity.kt (96%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Activity/MainActivity.kt (96%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Activity/ManagementActivity.kt (95%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Activity/MediaPlayerActivity.java (98%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Activity/MyActivity.kt (92%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Activity/MyPostActivity.kt (88%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Activity/PerceptionActivity.kt (91%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Activity/Perception_informationActivity.kt (96%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Activity/PhilosophyActivity.kt (95%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Activity/PsychologyActivity.kt (94%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Activity/ReAddressActivity.kt (97%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Activity/ReEmailActivity.kt (97%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Activity/ReMyinfoActivity.kt (97%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Activity/ReNameActivity.kt (97%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Activity/RePhoneActivity.kt (97%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Activity/ReSexActivity.kt (97%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Activity/ReSignatureActivity.kt (97%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Activity/RegisterActivity.kt (97%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Activity/ScienceActivity.kt (95%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Activity/SendSpecificActivity.kt (95%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Activity/sendPerceptionActivity.kt (93%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Adapter/BillboardAdapter.kt (95%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Adapter/BookAdapter.kt (93%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Adapter/BookAdapter2.kt (90%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Adapter/BookRankAdapter.kt (95%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Adapter/Book_authorAdapter.kt (89%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Adapter/BookshelfAdapter.kt (93%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Adapter/CommentAdapter.kt (95%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Adapter/GoodperceptionAdapter.kt (94%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Adapter/PerceptionAdapter.kt (94%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Adapter/send_perceptionAdapter.kt (95%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/AvatarImageView.java (55%) rename app/src/main/java/{com/zjgsu/jianshu/Bmob => edu/whut/jianshu/Data/entity}/Author_bmob.kt (84%) rename app/src/main/java/{com/zjgsu/jianshu/Bmob => edu/whut/jianshu/Data/entity}/BookShelf.kt (90%) rename app/src/main/java/{com/zjgsu/jianshu/Bmob => edu/whut/jianshu/Data/entity}/Book_bmob.kt (91%) rename app/src/main/java/{com/zjgsu/jianshu/Bmob => edu/whut/jianshu/Data/entity}/Book_inf_bmob.kt (94%) rename app/src/main/java/{com/zjgsu/jianshu/Bmob => edu/whut/jianshu/Data/entity}/Bookcontent_bmob.kt (82%) rename app/src/main/java/{com/zjgsu/jianshu/Bmob => edu/whut/jianshu/Data/entity}/Comment_bmob.kt (80%) rename app/src/main/java/{com/zjgsu/jianshu/Bmob => edu/whut/jianshu/Data/entity}/Perception_bmob.kt (85%) rename app/src/main/java/{com/zjgsu/jianshu/Bmob => edu/whut/jianshu/Data/entity}/User_bmob.kt (97%) rename app/src/main/java/{com/zjgsu/jianshu => edu/whut/jianshu/Data/vo}/Book.kt (72%) create mode 100644 app/src/main/java/edu/whut/jianshu/Data/vo/BookAuthor.kt rename app/src/main/java/{com/zjgsu/jianshu => edu/whut/jianshu/Data/vo}/Book_Shelf.kt (62%) rename app/src/main/java/{com/zjgsu/jianshu => edu/whut/jianshu/Data/vo}/Book_rank.kt (86%) rename app/src/main/java/{com/zjgsu/jianshu => edu/whut/jianshu/Data/vo}/Book_video.kt (77%) rename app/src/main/java/{com/zjgsu/jianshu => edu/whut/jianshu/Data/vo}/Comment.kt (52%) rename app/src/main/java/{com/zjgsu/jianshu => edu/whut/jianshu/Data/vo}/Perception.kt (56%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/DragableLuncher.java (99%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/Fragment/ContentFragment.kt (96%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/MyDialog.java (99%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/NavigationHelper.kt (92%) rename app/src/main/java/{com/zjgsu => edu/whut}/jianshu/showPopupcomment.java (99%) delete mode 100644 app/src/test/java/com/zjgsu/jianshu/ExampleUnitTest.kt diff --git a/app/src/androidTest/java/com/zjgsu/jianshu/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/zjgsu/jianshu/ExampleInstrumentedTest.kt deleted file mode 100644 index 9487043..0000000 --- a/app/src/androidTest/java/com/zjgsu/jianshu/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.zjgsu.jianshu - -import androidx.test.platform.app.InstrumentationRegistry -import androidx.test.ext.junit.runners.AndroidJUnit4 - -import org.junit.Test -import org.junit.runner.RunWith - -import org.junit.Assert.* - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.zjgsu.jianshu", appContext.packageName) - } -} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 047f089..20b0364 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="edu.whut.jianshu"> @@ -24,18 +24,18 @@ android:supportsRtl="true" android:theme="@style/Theme.Jianshu" android:usesCleartextTraffic="true"> - - - - - - - - - + + + + + + + + + - - + + @@ -46,27 +46,27 @@ - - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/zjgsu/jianshu/Activity/testgood.kt b/app/src/main/java/com/zjgsu/jianshu/Activity/testgood.kt deleted file mode 100644 index e907409..0000000 --- a/app/src/main/java/com/zjgsu/jianshu/Activity/testgood.kt +++ /dev/null @@ -1,54 +0,0 @@ -//package com.zjgsu.jianshu -// -//import android.content.Intent -//import android.graphics.Bitmap -//import android.graphics.BitmapFactory -//import androidx.appcompat.app.AppCompatActivity -//import android.os.Bundle -//import android.util.Log -//import androidx.recyclerview.widget.StaggeredGridLayoutManager -//import cn.bmob.v3.Bmob -//import cn.bmob.v3.BmobQuery -//import cn.bmob.v3.exception.BmobException -//import cn.bmob.v3.listener.FindListener -//import com.zjgsu.jianshu.Activity.AccountManagerActivity -//import com.zjgsu.jianshu.Activity.MyPostActivity -//import com.zjgsu.jianshu.Adapter.CommentAdapter -//import com.zjgsu.jianshu.Bmob.Comment_bmob -//import kotlinx.android.synthetic.main.activity_main.* -//import kotlinx.android.synthetic.main.activity_my.* -//import kotlinx.android.synthetic.main.activity_perception_infomation.* -//import kotlinx.android.synthetic.main.test11.* -//import java.io.InputStream -//import java.net.HttpURLConnection -//import java.net.URL -// -//class testgood : AppCompatActivity() { -// private val commentlist=ArrayList() -// override fun onCreate(savedInstanceState: Bundle?) { -// super.onCreate(savedInstanceState) -// setContentView(R.layout.test11) -// Bmob.initialize(this, "3ef45cbaebfff5cc05e559f8206b523f") //连接bmob -// val bmobquery=BmobQuery() -// bmobquery.addWhereEqualTo("perceptionid","e0cd40a953") -// bmobquery.findObjects(object:FindListener(){ -// override fun done(list:List, e:BmobException?){ -// if(e==null){ -// var cnt=0 -// for(i in list){ -// cnt++ -// commentlist.add(Comment(i.objectId)) -// val adapter = CommentAdapter(commentlist) -// recyclerView100.adapter = adapter -// } -// comment_cnt.text="评论 "+cnt.toString() -// } -// } -// }) -// val layoutManager = -// StaggeredGridLayoutManager(1, StaggeredGridLayoutManager.VERTICAL)//第一个参数是列数 -// recyclerView100.layoutManager = layoutManager -// var adapter = CommentAdapter(commentlist) -// } -//} -// diff --git a/app/src/main/java/com/zjgsu/jianshu/BookAuthor.kt b/app/src/main/java/com/zjgsu/jianshu/BookAuthor.kt deleted file mode 100644 index 0857e65..0000000 --- a/app/src/main/java/com/zjgsu/jianshu/BookAuthor.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.zjgsu.jianshu - -class AuthorWork(val book_name:String,val author_name:String,val bookurl:String) \ No newline at end of file diff --git a/app/src/main/java/com/zjgsu/jianshu/TypeView.kt b/app/src/main/java/com/zjgsu/jianshu/TypeView.kt deleted file mode 100644 index 53ce9de..0000000 --- a/app/src/main/java/com/zjgsu/jianshu/TypeView.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.zjgsu.jianshu - -import android.view.View -import androidx.recyclerview.widget.RecyclerView -import android.widget.TextView - -class TypeView(itemView: View) : RecyclerView.ViewHolder(itemView) { - var textView: TextView - - init { - textView = itemView.findViewById(R.id.book_Name) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/zjgsu/jianshu/Activity/AccountManagerActivity.kt b/app/src/main/java/edu/whut/jianshu/Activity/AccountManagerActivity.kt similarity index 82% rename from app/src/main/java/com/zjgsu/jianshu/Activity/AccountManagerActivity.kt rename to app/src/main/java/edu/whut/jianshu/Activity/AccountManagerActivity.kt index f7381d9..0076773 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Activity/AccountManagerActivity.kt +++ b/app/src/main/java/edu/whut/jianshu/Activity/AccountManagerActivity.kt @@ -1,8 +1,9 @@ -package com.zjgsu.jianshu.Activity +package edu.whut.jianshu.Activity import android.os.Bundle import androidx.appcompat.app.AppCompatActivity -import com.zjgsu.jianshu.R +import edu.whut.jianshu.R + class AccountManagerActivity:AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/zjgsu/jianshu/Activity/Author_introductionActivity.kt b/app/src/main/java/edu/whut/jianshu/Activity/Author_introductionActivity.kt similarity index 90% rename from app/src/main/java/com/zjgsu/jianshu/Activity/Author_introductionActivity.kt rename to app/src/main/java/edu/whut/jianshu/Activity/Author_introductionActivity.kt index eaf2d7d..e1657b7 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Activity/Author_introductionActivity.kt +++ b/app/src/main/java/edu/whut/jianshu/Activity/Author_introductionActivity.kt @@ -1,5 +1,4 @@ -package com.zjgsu.jianshu - +package edu.whut.jianshu.Activity import android.content.Context import android.os.Bundle import android.util.Log @@ -10,12 +9,15 @@ import cn.bmob.v3.BmobQuery import cn.bmob.v3.exception.BmobException import cn.bmob.v3.listener.FindListener import com.bumptech.glide.Glide -import com.zjgsu.jianshu.Bmob.Author_bmob -import com.zjgsu.jianshu.Bmob.Book_info_bmob +import edu.whut.jianshu.Adapter.Book_authorAdapter +import edu.whut.jianshu.Data.entity.Author_bmob +import edu.whut.jianshu.Data.entity.Book_info_bmob +import edu.whut.jianshu.Data.vo.BookAuthor +import edu.whut.jianshu.R import kotlinx.android.synthetic.main.activity_anthor_introduction.* class Author_introductionActivity : AppCompatActivity() { - private var authorworkList = ArrayList() + private var authorworkList = ArrayList() private lateinit var userId:String private lateinit var adapter: Book_authorAdapter override fun onCreate(savedInstanceState: Bundle?) { @@ -58,7 +60,7 @@ class Author_introductionActivity : AppCompatActivity() { authorworkList.addAll(it.map { b -> // 使用安全调用和Elvis操作符提供默认值或进行错误处理 val url = b.picture?.url ?: "default_url_or_handling_case" - AuthorWork(b.name,author_name.toString(), url) + BookAuthor(b.name,author_name.toString(), url) }) } adapter.notifyDataSetChanged() diff --git a/app/src/main/java/com/zjgsu/jianshu/Activity/BookInformationActivity.kt b/app/src/main/java/edu/whut/jianshu/Activity/BookInformationActivity.kt similarity index 97% rename from app/src/main/java/com/zjgsu/jianshu/Activity/BookInformationActivity.kt rename to app/src/main/java/edu/whut/jianshu/Activity/BookInformationActivity.kt index 75857c4..2d7d894 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Activity/BookInformationActivity.kt +++ b/app/src/main/java/edu/whut/jianshu/Activity/BookInformationActivity.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu +package edu.whut.jianshu.Activity import android.content.Context import android.content.Intent @@ -19,11 +19,13 @@ import androidx.recyclerview.widget.StaggeredGridLayoutManager import cn.bmob.v3.listener.SaveListener import com.bifan.txtreaderlib.ui.HwTxtPlayActivity import com.bumptech.glide.Glide -import com.zjgsu.jianshu.Adapter.GoodperceptionAdapter -import com.zjgsu.jianshu.Bmob.BookShelf -import com.zjgsu.jianshu.Bmob.Book_info_bmob -import com.zjgsu.jianshu.Bmob.Bookcontent_bmob -import com.zjgsu.jianshu.Bmob.Perception_bmob +import edu.whut.jianshu.Adapter.GoodperceptionAdapter +import edu.whut.jianshu.Data.entity.BookShelf +import edu.whut.jianshu.Data.entity.Book_info_bmob +import edu.whut.jianshu.Data.entity.Bookcontent_bmob +import edu.whut.jianshu.Data.entity.Perception_bmob +import edu.whut.jianshu.Data.vo.Perception +import edu.whut.jianshu.R import kotlinx.android.synthetic.main.activity_book_info.* import kotlinx.android.synthetic.main.bookinfo_title.* import okhttp3.* diff --git a/app/src/main/java/com/zjgsu/jianshu/Activity/BookIntroActivity.kt b/app/src/main/java/edu/whut/jianshu/Activity/BookIntroActivity.kt similarity index 94% rename from app/src/main/java/com/zjgsu/jianshu/Activity/BookIntroActivity.kt rename to app/src/main/java/edu/whut/jianshu/Activity/BookIntroActivity.kt index 74f08d4..efc0781 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Activity/BookIntroActivity.kt +++ b/app/src/main/java/edu/whut/jianshu/Activity/BookIntroActivity.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu +package edu.whut.jianshu.Activity import android.content.Intent import android.os.Bundle import android.util.Log @@ -7,7 +7,8 @@ import cn.bmob.v3.Bmob import cn.bmob.v3.BmobQuery import cn.bmob.v3.exception.BmobException import cn.bmob.v3.listener.FindListener -import com.zjgsu.jianshu.Bmob.Book_info_bmob +import edu.whut.jianshu.Data.entity.Book_info_bmob +import edu.whut.jianshu.R import kotlinx.android.synthetic.main.activity_bookintro.* import kotlinx.android.synthetic.main.expandable3.* import kotlinx.android.synthetic.main.expandable4.* diff --git a/app/src/main/java/com/zjgsu/jianshu/Activity/BookShelfActivity.kt b/app/src/main/java/edu/whut/jianshu/Activity/BookShelfActivity.kt similarity index 96% rename from app/src/main/java/com/zjgsu/jianshu/Activity/BookShelfActivity.kt rename to app/src/main/java/edu/whut/jianshu/Activity/BookShelfActivity.kt index 469c05a..d0a573b 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Activity/BookShelfActivity.kt +++ b/app/src/main/java/edu/whut/jianshu/Activity/BookShelfActivity.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu +package edu.whut.jianshu.Activity import android.content.Context import android.os.Bundle @@ -11,19 +11,21 @@ import cn.bmob.v3.Bmob import cn.bmob.v3.BmobQuery import cn.bmob.v3.exception.BmobException import cn.bmob.v3.listener.FindListener -import com.zjgsu.jianshu.Bmob.BookShelf import kotlinx.android.synthetic.main.activity_bookshelf.* - import android.widget.TextView - import android.widget.Button import androidx.appcompat.app.AlertDialog import cn.bmob.v3.listener.UpdateListener +import edu.whut.jianshu.Adapter.BookshelfAdapter +import edu.whut.jianshu.Data.entity.BookShelf +import edu.whut.jianshu.Data.vo.Book_Shelf +import edu.whut.jianshu.NavigationHelper +import edu.whut.jianshu.R import kotlinx.android.synthetic.main.layout_bottom_navigation.* class BookShelfActivity : AppCompatActivity() { val booklist = ArrayList() - lateinit var adapter:BookshelfAdapter + lateinit var adapter: BookshelfAdapter lateinit var userId:String override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/zjgsu/jianshu/Activity/FindpwdActivity.kt b/app/src/main/java/edu/whut/jianshu/Activity/FindpwdActivity.kt similarity index 96% rename from app/src/main/java/com/zjgsu/jianshu/Activity/FindpwdActivity.kt rename to app/src/main/java/edu/whut/jianshu/Activity/FindpwdActivity.kt index df0361d..49289d5 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Activity/FindpwdActivity.kt +++ b/app/src/main/java/edu/whut/jianshu/Activity/FindpwdActivity.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu +package edu.whut.jianshu.Activity import android.content.DialogInterface import android.content.Intent @@ -12,7 +12,8 @@ import cn.bmob.v3.Bmob import cn.bmob.v3.BmobQuery import cn.bmob.v3.exception.BmobException import cn.bmob.v3.listener.FindListener -import com.zjgsu.jianshu.Bmob.User_bmob +import edu.whut.jianshu.Data.entity.User_bmob +import edu.whut.jianshu.R import kotlinx.android.synthetic.main.activity_findpwd.* import kotlinx.android.synthetic.main.activity_findpwd.image_findpwd_backtoLogin diff --git a/app/src/main/java/com/zjgsu/jianshu/Activity/GoodBookActivity.kt b/app/src/main/java/edu/whut/jianshu/Activity/GoodBookActivity.kt similarity index 95% rename from app/src/main/java/com/zjgsu/jianshu/Activity/GoodBookActivity.kt rename to app/src/main/java/edu/whut/jianshu/Activity/GoodBookActivity.kt index 179988a..feef6a7 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Activity/GoodBookActivity.kt +++ b/app/src/main/java/edu/whut/jianshu/Activity/GoodBookActivity.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu +package edu.whut.jianshu.Activity import android.content.Context import android.os.Bundle @@ -9,8 +9,10 @@ import cn.bmob.v3.Bmob import cn.bmob.v3.BmobQuery import cn.bmob.v3.exception.BmobException import cn.bmob.v3.listener.FindListener -import com.zjgsu.jianshu.Adapter.BookRankAdapter -import com.zjgsu.jianshu.Bmob.Book_info_bmob +import edu.whut.jianshu.Adapter.BookRankAdapter +import edu.whut.jianshu.Data.entity.Book_info_bmob +import edu.whut.jianshu.Data.vo.Book_rank +import edu.whut.jianshu.R import kotlinx.android.synthetic.main.activity_bookrank.* class GoodBookActivity : AppCompatActivity() { diff --git a/app/src/main/java/com/zjgsu/jianshu/Activity/HotBookActivity.kt b/app/src/main/java/edu/whut/jianshu/Activity/HotBookActivity.kt similarity index 94% rename from app/src/main/java/com/zjgsu/jianshu/Activity/HotBookActivity.kt rename to app/src/main/java/edu/whut/jianshu/Activity/HotBookActivity.kt index 120bf02..38adf4e 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Activity/HotBookActivity.kt +++ b/app/src/main/java/edu/whut/jianshu/Activity/HotBookActivity.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu +package edu.whut.jianshu.Activity import android.content.Context import android.os.Bundle import android.widget.Toast @@ -8,8 +8,10 @@ import cn.bmob.v3.Bmob import cn.bmob.v3.BmobQuery import cn.bmob.v3.exception.BmobException import cn.bmob.v3.listener.FindListener -import com.zjgsu.jianshu.Adapter.BookRankAdapter -import com.zjgsu.jianshu.Bmob.Book_info_bmob +import edu.whut.jianshu.Adapter.BookRankAdapter +import edu.whut.jianshu.Data.entity.Book_info_bmob +import edu.whut.jianshu.Data.vo.Book_rank +import edu.whut.jianshu.R import kotlinx.android.synthetic.main.activity_bookrank.* class HotBookActivity: AppCompatActivity() { diff --git a/app/src/main/java/com/zjgsu/jianshu/Activity/LiteratureActivity.kt b/app/src/main/java/edu/whut/jianshu/Activity/LiteratureActivity.kt similarity index 95% rename from app/src/main/java/com/zjgsu/jianshu/Activity/LiteratureActivity.kt rename to app/src/main/java/edu/whut/jianshu/Activity/LiteratureActivity.kt index eaae30c..c810781 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Activity/LiteratureActivity.kt +++ b/app/src/main/java/edu/whut/jianshu/Activity/LiteratureActivity.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu +package edu.whut.jianshu.Activity import android.content.Intent import android.os.Bundle @@ -13,8 +13,10 @@ import cn.bmob.v3.Bmob import cn.bmob.v3.BmobQuery import cn.bmob.v3.exception.BmobException import cn.bmob.v3.listener.FindListener -import com.zjgsu.jianshu.Adapter.BookAdapter2 -import com.zjgsu.jianshu.Bmob.Book_bmob +import edu.whut.jianshu.Adapter.BookAdapter2 +import edu.whut.jianshu.Data.entity.Book_bmob +import edu.whut.jianshu.Data.vo.Book +import edu.whut.jianshu.R import kotlinx.android.synthetic.main.activity_categorypage.* import kotlinx.android.synthetic.main.layout_bottom_navigation.* diff --git a/app/src/main/java/com/zjgsu/jianshu/Activity/LoginActivity.kt b/app/src/main/java/edu/whut/jianshu/Activity/LoginActivity.kt similarity index 96% rename from app/src/main/java/com/zjgsu/jianshu/Activity/LoginActivity.kt rename to app/src/main/java/edu/whut/jianshu/Activity/LoginActivity.kt index 0ffbf4b..6a7f5f4 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Activity/LoginActivity.kt +++ b/app/src/main/java/edu/whut/jianshu/Activity/LoginActivity.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu +package edu.whut.jianshu.Activity import android.content.Context import android.content.Intent @@ -9,7 +9,8 @@ import cn.bmob.v3.Bmob import cn.bmob.v3.BmobQuery import cn.bmob.v3.exception.BmobException import cn.bmob.v3.listener.FindListener -import com.zjgsu.jianshu.Bmob.User_bmob +import edu.whut.jianshu.Data.entity.User_bmob +import edu.whut.jianshu.R import kotlinx.android.synthetic.main.activity_login.* class LoginActivity : AppCompatActivity() { diff --git a/app/src/main/java/com/zjgsu/jianshu/Activity/MainActivity.kt b/app/src/main/java/edu/whut/jianshu/Activity/MainActivity.kt similarity index 96% rename from app/src/main/java/com/zjgsu/jianshu/Activity/MainActivity.kt rename to app/src/main/java/edu/whut/jianshu/Activity/MainActivity.kt index 25a1266..39e2587 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Activity/MainActivity.kt +++ b/app/src/main/java/edu/whut/jianshu/Activity/MainActivity.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu +package edu.whut.jianshu.Activity import android.content.Intent import android.os.Bundle @@ -15,9 +15,14 @@ import cn.bmob.v3.Bmob import cn.bmob.v3.BmobQuery import cn.bmob.v3.exception.BmobException import cn.bmob.v3.listener.FindListener -import com.zjgsu.jianshu.Adapter.BillboardAdapter -import com.zjgsu.jianshu.Bmob.Book_bmob -import com.zjgsu.jianshu.Bmob.Book_info_bmob +import edu.whut.jianshu.Adapter.BillboardAdapter +import edu.whut.jianshu.Adapter.BookAdapter +import edu.whut.jianshu.Data.entity.Book_bmob +import edu.whut.jianshu.Data.entity.Book_info_bmob +import edu.whut.jianshu.Data.vo.Book +import edu.whut.jianshu.Data.vo.Book_rank +import edu.whut.jianshu.NavigationHelper +import edu.whut.jianshu.R import kotlinx.android.synthetic.main.activity_main.* import kotlinx.android.synthetic.main.layout_bottom_navigation.* diff --git a/app/src/main/java/com/zjgsu/jianshu/Activity/ManagementActivity.kt b/app/src/main/java/edu/whut/jianshu/Activity/ManagementActivity.kt similarity index 95% rename from app/src/main/java/com/zjgsu/jianshu/Activity/ManagementActivity.kt rename to app/src/main/java/edu/whut/jianshu/Activity/ManagementActivity.kt index 0669e51..d6854e1 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Activity/ManagementActivity.kt +++ b/app/src/main/java/edu/whut/jianshu/Activity/ManagementActivity.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu +package edu.whut.jianshu.Activity import android.content.Intent import android.os.Bundle import android.util.Log @@ -12,8 +12,10 @@ import cn.bmob.v3.Bmob import cn.bmob.v3.BmobQuery import cn.bmob.v3.exception.BmobException import cn.bmob.v3.listener.FindListener -import com.zjgsu.jianshu.Adapter.BookAdapter2 -import com.zjgsu.jianshu.Bmob.Book_bmob +import edu.whut.jianshu.Adapter.BookAdapter2 +import edu.whut.jianshu.Data.entity.Book_bmob +import edu.whut.jianshu.Data.vo.Book +import edu.whut.jianshu.R import kotlinx.android.synthetic.main.activity_categorypage.* import kotlinx.android.synthetic.main.layout_bottom_navigation.* diff --git a/app/src/main/java/com/zjgsu/jianshu/Activity/MediaPlayerActivity.java b/app/src/main/java/edu/whut/jianshu/Activity/MediaPlayerActivity.java similarity index 98% rename from app/src/main/java/com/zjgsu/jianshu/Activity/MediaPlayerActivity.java rename to app/src/main/java/edu/whut/jianshu/Activity/MediaPlayerActivity.java index b9ec934..11d6e10 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Activity/MediaPlayerActivity.java +++ b/app/src/main/java/edu/whut/jianshu/Activity/MediaPlayerActivity.java @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu.Activity; +package edu.whut.jianshu.Activity; import android.app.Activity; import android.graphics.BitmapFactory; import android.graphics.Matrix; @@ -10,13 +10,13 @@ import android.view.animation.Animation; import android.view.animation.TranslateAnimation; import android.widget.ImageView; import android.widget.TextView; - -import com.zjgsu.jianshu.R; import androidx.viewpager.widget.PagerAdapter; import androidx.viewpager.widget.ViewPager; import java.util.ArrayList; +import edu.whut.jianshu.R; + public class MediaPlayerActivity extends Activity implements View.OnClickListener{ private ViewPager viewPager; diff --git a/app/src/main/java/com/zjgsu/jianshu/Activity/MyActivity.kt b/app/src/main/java/edu/whut/jianshu/Activity/MyActivity.kt similarity index 92% rename from app/src/main/java/com/zjgsu/jianshu/Activity/MyActivity.kt rename to app/src/main/java/edu/whut/jianshu/Activity/MyActivity.kt index 0368035..07e3523 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Activity/MyActivity.kt +++ b/app/src/main/java/edu/whut/jianshu/Activity/MyActivity.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu +package edu.whut.jianshu.Activity import android.content.Context import android.content.Intent @@ -10,9 +10,9 @@ import cn.bmob.v3.Bmob import cn.bmob.v3.BmobQuery import cn.bmob.v3.exception.BmobException import cn.bmob.v3.listener.FindListener -import com.zjgsu.jianshu.Activity.AccountManagerActivity -import com.zjgsu.jianshu.Activity.MyPostActivity -import com.zjgsu.jianshu.Bmob.User_bmob +import edu.whut.jianshu.Data.entity.User_bmob +import edu.whut.jianshu.NavigationHelper +import edu.whut.jianshu.R import kotlinx.android.synthetic.main.activity_my.* import kotlinx.android.synthetic.main.layout_bottom_navigation.* import java.io.InputStream @@ -73,13 +73,13 @@ class MyActivity : AppCompatActivity() { } //我的发布 myPost.setOnClickListener { - val intent= Intent(this,MyPostActivity::class.java) + val intent= Intent(this, edu.whut.jianshu.Activity.MyPostActivity::class.java) startActivity(intent) finish() } //账号管理 account_manager.setOnClickListener{ - val intent= Intent(this,AccountManagerActivity::class.java) + val intent= Intent(this, edu.whut.jianshu.Activity.AccountManagerActivity::class.java) val userData=user_account intent.putExtra("extra_user_data",userData) startActivity(intent) diff --git a/app/src/main/java/com/zjgsu/jianshu/Activity/MyPostActivity.kt b/app/src/main/java/edu/whut/jianshu/Activity/MyPostActivity.kt similarity index 88% rename from app/src/main/java/com/zjgsu/jianshu/Activity/MyPostActivity.kt rename to app/src/main/java/edu/whut/jianshu/Activity/MyPostActivity.kt index 853e8de..08317bf 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Activity/MyPostActivity.kt +++ b/app/src/main/java/edu/whut/jianshu/Activity/MyPostActivity.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu.Activity +package edu.whut.jianshu.Activity import android.content.Context import android.content.Intent @@ -10,8 +10,10 @@ import cn.bmob.v3.Bmob import cn.bmob.v3.BmobQuery import cn.bmob.v3.exception.BmobException import cn.bmob.v3.listener.FindListener -import com.zjgsu.jianshu.* -import com.zjgsu.jianshu.Bmob.Perception_bmob +import edu.whut.jianshu.Adapter.PerceptionAdapter +import edu.whut.jianshu.Data.entity.Perception_bmob +import edu.whut.jianshu.Data.vo.Perception +import edu.whut.jianshu.R import kotlinx.android.synthetic.main.activity_my_post.* class MyPostActivity : AppCompatActivity() { @@ -26,7 +28,7 @@ class MyPostActivity : AppCompatActivity() { val layoutManager=LinearLayoutManager(this) myPost_recyclerView.layoutManager = layoutManager - val adapter =PerceptionAdapter(PerceptionList) + val adapter = PerceptionAdapter(PerceptionList) myPost_recyclerView.adapter = adapter diff --git a/app/src/main/java/com/zjgsu/jianshu/Activity/PerceptionActivity.kt b/app/src/main/java/edu/whut/jianshu/Activity/PerceptionActivity.kt similarity index 91% rename from app/src/main/java/com/zjgsu/jianshu/Activity/PerceptionActivity.kt rename to app/src/main/java/edu/whut/jianshu/Activity/PerceptionActivity.kt index 9562491..ff81502 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Activity/PerceptionActivity.kt +++ b/app/src/main/java/edu/whut/jianshu/Activity/PerceptionActivity.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu +package edu.whut.jianshu.Activity import android.content.Intent import androidx.appcompat.app.AppCompatActivity @@ -9,8 +9,11 @@ import cn.bmob.v3.Bmob import cn.bmob.v3.BmobQuery import cn.bmob.v3.exception.BmobException import cn.bmob.v3.listener.FindListener -import com.zjgsu.jianshu.Activity.sendPerceptionActivity -import com.zjgsu.jianshu.Bmob.Perception_bmob +import edu.whut.jianshu.Adapter.PerceptionAdapter +import edu.whut.jianshu.Data.entity.Perception_bmob +import edu.whut.jianshu.Data.vo.Perception +import edu.whut.jianshu.NavigationHelper +import edu.whut.jianshu.R import kotlinx.android.synthetic.main.activity_perception.* import kotlinx.android.synthetic.main.layout_bottom_navigation.* diff --git a/app/src/main/java/com/zjgsu/jianshu/Activity/Perception_informationActivity.kt b/app/src/main/java/edu/whut/jianshu/Activity/Perception_informationActivity.kt similarity index 96% rename from app/src/main/java/com/zjgsu/jianshu/Activity/Perception_informationActivity.kt rename to app/src/main/java/edu/whut/jianshu/Activity/Perception_informationActivity.kt index 632ee87..b660f14 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Activity/Perception_informationActivity.kt +++ b/app/src/main/java/edu/whut/jianshu/Activity/Perception_informationActivity.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu.Activity +package edu.whut.jianshu.Activity import android.content.Context import android.content.Intent @@ -14,12 +14,13 @@ import cn.bmob.v3.BmobQuery import cn.bmob.v3.exception.BmobException import cn.bmob.v3.listener.FindListener import cn.bmob.v3.listener.SaveListener -import com.zjgsu.jianshu.* -import com.zjgsu.jianshu.Adapter.CommentAdapter -import com.zjgsu.jianshu.Bmob.Book_info_bmob -import com.zjgsu.jianshu.Bmob.Comment_bmob -import com.zjgsu.jianshu.Bmob.Perception_bmob -import com.zjgsu.jianshu.Bmob.User_bmob +import edu.whut.jianshu.Adapter.CommentAdapter +import edu.whut.jianshu.Data.entity.Book_info_bmob +import edu.whut.jianshu.Data.entity.Comment_bmob +import edu.whut.jianshu.Data.entity.Perception_bmob +import edu.whut.jianshu.Data.entity.User_bmob +import edu.whut.jianshu.Data.vo.Comment +import edu.whut.jianshu.R import kotlinx.android.synthetic.main.activity_perception_infomation.* import java.io.InputStream import java.net.HttpURLConnection @@ -44,7 +45,7 @@ class Perception_informationActivity:AppCompatActivity() { var adapter = CommentAdapter(commentlist) comment_recyclerview.adapter = adapter submitComment.setOnClickListener { - val comment=Comment_bmob() + val comment= Comment_bmob() comment.text=yourcomment.text.toString() comment.perceptionid=perceptionid comment.comment_personid= userId diff --git a/app/src/main/java/com/zjgsu/jianshu/Activity/PhilosophyActivity.kt b/app/src/main/java/edu/whut/jianshu/Activity/PhilosophyActivity.kt similarity index 95% rename from app/src/main/java/com/zjgsu/jianshu/Activity/PhilosophyActivity.kt rename to app/src/main/java/edu/whut/jianshu/Activity/PhilosophyActivity.kt index d1b8480..3a3db44 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Activity/PhilosophyActivity.kt +++ b/app/src/main/java/edu/whut/jianshu/Activity/PhilosophyActivity.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu +package edu.whut.jianshu.Activity import android.content.Intent import android.os.Bundle @@ -13,8 +13,10 @@ import cn.bmob.v3.Bmob import cn.bmob.v3.BmobQuery import cn.bmob.v3.exception.BmobException import cn.bmob.v3.listener.FindListener -import com.zjgsu.jianshu.Adapter.BookAdapter2 -import com.zjgsu.jianshu.Bmob.Book_bmob +import edu.whut.jianshu.Adapter.BookAdapter2 +import edu.whut.jianshu.Data.entity.Book_bmob +import edu.whut.jianshu.Data.vo.Book +import edu.whut.jianshu.R import kotlinx.android.synthetic.main.activity_categorypage.* import kotlinx.android.synthetic.main.layout_bottom_navigation.* diff --git a/app/src/main/java/com/zjgsu/jianshu/Activity/PsychologyActivity.kt b/app/src/main/java/edu/whut/jianshu/Activity/PsychologyActivity.kt similarity index 94% rename from app/src/main/java/com/zjgsu/jianshu/Activity/PsychologyActivity.kt rename to app/src/main/java/edu/whut/jianshu/Activity/PsychologyActivity.kt index 726ea44..a3d1b49 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Activity/PsychologyActivity.kt +++ b/app/src/main/java/edu/whut/jianshu/Activity/PsychologyActivity.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu +package edu.whut.jianshu.Activity import android.content.Intent import android.os.Bundle import android.util.Log @@ -12,8 +12,10 @@ import cn.bmob.v3.Bmob import cn.bmob.v3.BmobQuery import cn.bmob.v3.exception.BmobException import cn.bmob.v3.listener.FindListener -import com.zjgsu.jianshu.Adapter.BookAdapter2 -import com.zjgsu.jianshu.Bmob.Book_bmob +import edu.whut.jianshu.Adapter.BookAdapter2 +import edu.whut.jianshu.Data.entity.Book_bmob +import edu.whut.jianshu.Data.vo.Book +import edu.whut.jianshu.R import kotlinx.android.synthetic.main.activity_categorypage.* import kotlinx.android.synthetic.main.layout_bottom_navigation.* @@ -23,7 +25,8 @@ class PsychologyActivity:AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.activity_categorypage) + setContentView( + R.layout.activity_categorypage) supportActionBar?.setDisplayHomeAsUpEnabled(true) supportActionBar?.setHomeAsUpIndicator(R.drawable.menu) Bmob.initialize(this, "8f9f1d1ea520b0ce4f84a6fa83a5f754") diff --git a/app/src/main/java/com/zjgsu/jianshu/Activity/ReAddressActivity.kt b/app/src/main/java/edu/whut/jianshu/Activity/ReAddressActivity.kt similarity index 97% rename from app/src/main/java/com/zjgsu/jianshu/Activity/ReAddressActivity.kt rename to app/src/main/java/edu/whut/jianshu/Activity/ReAddressActivity.kt index 85009bf..1d2f75d 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Activity/ReAddressActivity.kt +++ b/app/src/main/java/edu/whut/jianshu/Activity/ReAddressActivity.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu +package edu.whut.jianshu.Activity import android.content.Intent import androidx.appcompat.app.AppCompatActivity @@ -10,7 +10,8 @@ import cn.bmob.v3.BmobQuery import cn.bmob.v3.exception.BmobException import cn.bmob.v3.listener.FindListener import cn.bmob.v3.listener.UpdateListener -import com.zjgsu.jianshu.Bmob.User_bmob +import edu.whut.jianshu.Data.entity.User_bmob +import edu.whut.jianshu.R import kotlinx.android.synthetic.main.activity_re_email.* class ReAddressActivity : AppCompatActivity() { diff --git a/app/src/main/java/com/zjgsu/jianshu/Activity/ReEmailActivity.kt b/app/src/main/java/edu/whut/jianshu/Activity/ReEmailActivity.kt similarity index 97% rename from app/src/main/java/com/zjgsu/jianshu/Activity/ReEmailActivity.kt rename to app/src/main/java/edu/whut/jianshu/Activity/ReEmailActivity.kt index c71cda5..f84707e 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Activity/ReEmailActivity.kt +++ b/app/src/main/java/edu/whut/jianshu/Activity/ReEmailActivity.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu +package edu.whut.jianshu.Activity import android.content.Intent import androidx.appcompat.app.AppCompatActivity @@ -10,7 +10,8 @@ import cn.bmob.v3.BmobQuery import cn.bmob.v3.exception.BmobException import cn.bmob.v3.listener.FindListener import cn.bmob.v3.listener.UpdateListener -import com.zjgsu.jianshu.Bmob.User_bmob +import edu.whut.jianshu.Data.entity.User_bmob +import edu.whut.jianshu.R import kotlinx.android.synthetic.main.activity_re_email.* import kotlinx.android.synthetic.main.activity_re_email.back2my diff --git a/app/src/main/java/com/zjgsu/jianshu/Activity/ReMyinfoActivity.kt b/app/src/main/java/edu/whut/jianshu/Activity/ReMyinfoActivity.kt similarity index 97% rename from app/src/main/java/com/zjgsu/jianshu/Activity/ReMyinfoActivity.kt rename to app/src/main/java/edu/whut/jianshu/Activity/ReMyinfoActivity.kt index 2a36fc5..a5e54e3 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Activity/ReMyinfoActivity.kt +++ b/app/src/main/java/edu/whut/jianshu/Activity/ReMyinfoActivity.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu +package edu.whut.jianshu.Activity import android.content.Intent import androidx.appcompat.app.AppCompatActivity @@ -9,7 +9,8 @@ import cn.bmob.v3.BmobQuery import cn.bmob.v3.exception.BmobException import cn.bmob.v3.listener.FindListener import kotlinx.android.synthetic.main.activity_re_myinfo.* -import com.zjgsu.jianshu.Bmob.User_bmob +import edu.whut.jianshu.Data.entity.User_bmob +import edu.whut.jianshu.R class ReMyinfoActivity : AppCompatActivity() { diff --git a/app/src/main/java/com/zjgsu/jianshu/Activity/ReNameActivity.kt b/app/src/main/java/edu/whut/jianshu/Activity/ReNameActivity.kt similarity index 97% rename from app/src/main/java/com/zjgsu/jianshu/Activity/ReNameActivity.kt rename to app/src/main/java/edu/whut/jianshu/Activity/ReNameActivity.kt index 9405563..5c25fed 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Activity/ReNameActivity.kt +++ b/app/src/main/java/edu/whut/jianshu/Activity/ReNameActivity.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu +package edu.whut.jianshu.Activity import android.content.Intent import androidx.appcompat.app.AppCompatActivity @@ -9,7 +9,8 @@ import cn.bmob.v3.BmobQuery import cn.bmob.v3.exception.BmobException import cn.bmob.v3.listener.FindListener import cn.bmob.v3.listener.UpdateListener -import com.zjgsu.jianshu.Bmob.User_bmob +import edu.whut.jianshu.Data.entity.User_bmob +import edu.whut.jianshu.R import kotlinx.android.synthetic.main.activity_re_name.* import kotlinx.android.synthetic.main.activity_re_name.back2my diff --git a/app/src/main/java/com/zjgsu/jianshu/Activity/RePhoneActivity.kt b/app/src/main/java/edu/whut/jianshu/Activity/RePhoneActivity.kt similarity index 97% rename from app/src/main/java/com/zjgsu/jianshu/Activity/RePhoneActivity.kt rename to app/src/main/java/edu/whut/jianshu/Activity/RePhoneActivity.kt index 70fc4b6..1f5e9fe 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Activity/RePhoneActivity.kt +++ b/app/src/main/java/edu/whut/jianshu/Activity/RePhoneActivity.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu +package edu.whut.jianshu.Activity import android.content.Intent import androidx.appcompat.app.AppCompatActivity @@ -9,7 +9,8 @@ import cn.bmob.v3.BmobQuery import cn.bmob.v3.exception.BmobException import cn.bmob.v3.listener.FindListener import cn.bmob.v3.listener.UpdateListener -import com.zjgsu.jianshu.Bmob.User_bmob +import edu.whut.jianshu.Data.entity.User_bmob +import edu.whut.jianshu.R import kotlinx.android.synthetic.main.activity_re_phone.* diff --git a/app/src/main/java/com/zjgsu/jianshu/Activity/ReSexActivity.kt b/app/src/main/java/edu/whut/jianshu/Activity/ReSexActivity.kt similarity index 97% rename from app/src/main/java/com/zjgsu/jianshu/Activity/ReSexActivity.kt rename to app/src/main/java/edu/whut/jianshu/Activity/ReSexActivity.kt index 97eb2ad..0531b39 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Activity/ReSexActivity.kt +++ b/app/src/main/java/edu/whut/jianshu/Activity/ReSexActivity.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu +package edu.whut.jianshu.Activity import android.content.Intent import androidx.appcompat.app.AppCompatActivity @@ -9,7 +9,8 @@ import cn.bmob.v3.BmobQuery import cn.bmob.v3.exception.BmobException import cn.bmob.v3.listener.FindListener import cn.bmob.v3.listener.UpdateListener -import com.zjgsu.jianshu.Bmob.User_bmob +import edu.whut.jianshu.Data.entity.User_bmob +import edu.whut.jianshu.R import kotlinx.android.synthetic.main.activity_re_sex.back2my import kotlinx.android.synthetic.main.activity_re_sex.btnOk import kotlinx.android.synthetic.main.activity_re_sex.et_account diff --git a/app/src/main/java/com/zjgsu/jianshu/Activity/ReSignatureActivity.kt b/app/src/main/java/edu/whut/jianshu/Activity/ReSignatureActivity.kt similarity index 97% rename from app/src/main/java/com/zjgsu/jianshu/Activity/ReSignatureActivity.kt rename to app/src/main/java/edu/whut/jianshu/Activity/ReSignatureActivity.kt index cf4083d..7b3311b 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Activity/ReSignatureActivity.kt +++ b/app/src/main/java/edu/whut/jianshu/Activity/ReSignatureActivity.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu +package edu.whut.jianshu.Activity import android.content.Intent import androidx.appcompat.app.AppCompatActivity @@ -10,7 +10,8 @@ import cn.bmob.v3.BmobQuery import cn.bmob.v3.exception.BmobException import cn.bmob.v3.listener.FindListener import cn.bmob.v3.listener.UpdateListener -import com.zjgsu.jianshu.Bmob.User_bmob +import edu.whut.jianshu.Data.entity.User_bmob +import edu.whut.jianshu.R import kotlinx.android.synthetic.main.activity_re_name.* class ReSignatureActivity : AppCompatActivity() { diff --git a/app/src/main/java/com/zjgsu/jianshu/Activity/RegisterActivity.kt b/app/src/main/java/edu/whut/jianshu/Activity/RegisterActivity.kt similarity index 97% rename from app/src/main/java/com/zjgsu/jianshu/Activity/RegisterActivity.kt rename to app/src/main/java/edu/whut/jianshu/Activity/RegisterActivity.kt index 190f8f6..d2ec935 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Activity/RegisterActivity.kt +++ b/app/src/main/java/edu/whut/jianshu/Activity/RegisterActivity.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu +package edu.whut.jianshu.Activity import android.content.Intent import android.os.Bundle @@ -10,7 +10,8 @@ import cn.bmob.v3.BmobQuery import cn.bmob.v3.exception.BmobException import cn.bmob.v3.listener.FindListener import cn.bmob.v3.listener.SaveListener -import com.zjgsu.jianshu.Bmob.User_bmob +import edu.whut.jianshu.Data.entity.User_bmob +import edu.whut.jianshu.R import kotlinx.android.synthetic.main.activity_register.* class RegisterActivity : AppCompatActivity() { diff --git a/app/src/main/java/com/zjgsu/jianshu/Activity/ScienceActivity.kt b/app/src/main/java/edu/whut/jianshu/Activity/ScienceActivity.kt similarity index 95% rename from app/src/main/java/com/zjgsu/jianshu/Activity/ScienceActivity.kt rename to app/src/main/java/edu/whut/jianshu/Activity/ScienceActivity.kt index c17cac2..09bcb96 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Activity/ScienceActivity.kt +++ b/app/src/main/java/edu/whut/jianshu/Activity/ScienceActivity.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu +package edu.whut.jianshu.Activity import android.content.Intent import android.os.Bundle @@ -13,8 +13,10 @@ import cn.bmob.v3.Bmob import cn.bmob.v3.BmobQuery import cn.bmob.v3.exception.BmobException import cn.bmob.v3.listener.FindListener -import com.zjgsu.jianshu.Adapter.BookAdapter2 -import com.zjgsu.jianshu.Bmob.Book_bmob +import edu.whut.jianshu.Adapter.BookAdapter2 +import edu.whut.jianshu.Data.entity.Book_bmob +import edu.whut.jianshu.Data.vo.Book +import edu.whut.jianshu.R import kotlinx.android.synthetic.main.activity_categorypage.* import kotlinx.android.synthetic.main.layout_bottom_navigation.* diff --git a/app/src/main/java/com/zjgsu/jianshu/Activity/SendSpecificActivity.kt b/app/src/main/java/edu/whut/jianshu/Activity/SendSpecificActivity.kt similarity index 95% rename from app/src/main/java/com/zjgsu/jianshu/Activity/SendSpecificActivity.kt rename to app/src/main/java/edu/whut/jianshu/Activity/SendSpecificActivity.kt index 33d0333..3502ec3 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Activity/SendSpecificActivity.kt +++ b/app/src/main/java/edu/whut/jianshu/Activity/SendSpecificActivity.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu +package edu.whut.jianshu.Activity import android.content.Context import android.content.Intent @@ -11,7 +11,8 @@ import androidx.appcompat.app.AppCompatActivity import cn.bmob.v3.Bmob import cn.bmob.v3.exception.BmobException import cn.bmob.v3.listener.SaveListener -import com.zjgsu.jianshu.Bmob.Perception_bmob +import edu.whut.jianshu.Data.entity.Perception_bmob +import edu.whut.jianshu.R import kotlinx.android.synthetic.main.activity_sendspecific.* class SendSpecificActivity: AppCompatActivity() { @@ -51,7 +52,7 @@ class SendSpecificActivity: AppCompatActivity() { finish() } sendspecific_submit.setOnClickListener { - val perception=Perception_bmob() + val perception= Perception_bmob() perception.b_name=bookname perception.userid=userId perception.perception=sendspecific_content.text.toString() diff --git a/app/src/main/java/com/zjgsu/jianshu/Activity/sendPerceptionActivity.kt b/app/src/main/java/edu/whut/jianshu/Activity/sendPerceptionActivity.kt similarity index 93% rename from app/src/main/java/com/zjgsu/jianshu/Activity/sendPerceptionActivity.kt rename to app/src/main/java/edu/whut/jianshu/Activity/sendPerceptionActivity.kt index 341a606..eabb31f 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Activity/sendPerceptionActivity.kt +++ b/app/src/main/java/edu/whut/jianshu/Activity/sendPerceptionActivity.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu.Activity +package edu.whut.jianshu.Activity import android.content.Context import android.content.Intent @@ -16,10 +16,13 @@ import cn.bmob.v3.listener.FindListener import cn.bmob.v3.listener.QueryListener import cn.bmob.v3.listener.SaveListener import com.bumptech.glide.Glide -import com.zjgsu.jianshu.* -import com.zjgsu.jianshu.Bmob.Book_info_bmob -import com.zjgsu.jianshu.Bmob.Perception_bmob -import com.zjgsu.jianshu.Bmob.User_bmob +import edu.whut.jianshu.Adapter.selectedBook +import edu.whut.jianshu.Adapter.send_perceptionAdapter +import edu.whut.jianshu.Data.entity.Book_info_bmob +import edu.whut.jianshu.Data.entity.Perception_bmob +import edu.whut.jianshu.Data.entity.User_bmob +import edu.whut.jianshu.Data.vo.Book_Shelf +import edu.whut.jianshu.R import kotlinx.android.synthetic.main.activity_sendperception.* class sendPerceptionActivity:AppCompatActivity() { diff --git a/app/src/main/java/com/zjgsu/jianshu/Adapter/BillboardAdapter.kt b/app/src/main/java/edu/whut/jianshu/Adapter/BillboardAdapter.kt similarity index 95% rename from app/src/main/java/com/zjgsu/jianshu/Adapter/BillboardAdapter.kt rename to app/src/main/java/edu/whut/jianshu/Adapter/BillboardAdapter.kt index 8144e95..60d97cf 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Adapter/BillboardAdapter.kt +++ b/app/src/main/java/edu/whut/jianshu/Adapter/BillboardAdapter.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu.Adapter +package edu.whut.jianshu.Adapter import android.content.Intent import android.view.LayoutInflater @@ -10,7 +10,10 @@ import android.widget.TextView import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.zjgsu.jianshu.* +import edu.whut.jianshu.Activity.GoodBookActivity +import edu.whut.jianshu.Activity.HotBookActivity +import edu.whut.jianshu.Data.vo.Book_rank +import edu.whut.jianshu.R class BillboardAdapter(var listOfbookRankList: List>) : RecyclerView.Adapter() { inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) { diff --git a/app/src/main/java/com/zjgsu/jianshu/Adapter/BookAdapter.kt b/app/src/main/java/edu/whut/jianshu/Adapter/BookAdapter.kt similarity index 93% rename from app/src/main/java/com/zjgsu/jianshu/Adapter/BookAdapter.kt rename to app/src/main/java/edu/whut/jianshu/Adapter/BookAdapter.kt index 79e9fda..d5662cc 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Adapter/BookAdapter.kt +++ b/app/src/main/java/edu/whut/jianshu/Adapter/BookAdapter.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu +package edu.whut.jianshu.Adapter import android.content.Intent import android.view.LayoutInflater @@ -10,6 +10,10 @@ import android.widget.TextView import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide +import edu.whut.jianshu.Activity.BookInformationActivity +import edu.whut.jianshu.Activity.MainActivity +import edu.whut.jianshu.Data.vo.Book +import edu.whut.jianshu.R class BookAdapter(var bookList: List) : RecyclerView.Adapter() { diff --git a/app/src/main/java/com/zjgsu/jianshu/Adapter/BookAdapter2.kt b/app/src/main/java/edu/whut/jianshu/Adapter/BookAdapter2.kt similarity index 90% rename from app/src/main/java/com/zjgsu/jianshu/Adapter/BookAdapter2.kt rename to app/src/main/java/edu/whut/jianshu/Adapter/BookAdapter2.kt index 767c335..cef445b 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Adapter/BookAdapter2.kt +++ b/app/src/main/java/edu/whut/jianshu/Adapter/BookAdapter2.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu.Adapter +package edu.whut.jianshu.Adapter import android.content.Intent import android.view.LayoutInflater @@ -10,9 +10,11 @@ import android.widget.TextView import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.zjgsu.jianshu.* +import edu.whut.jianshu.Activity.* +import edu.whut.jianshu.Data.vo.Book +import edu.whut.jianshu.R -class BookAdapter2(val bookList: List,val categoryId:Int) : RecyclerView.Adapter() { +class BookAdapter2(val bookList: List, val categoryId:Int) : RecyclerView.Adapter() { inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) { val bookList_Image: ImageView = view.findViewById(R.id.book_Image) diff --git a/app/src/main/java/com/zjgsu/jianshu/Adapter/BookRankAdapter.kt b/app/src/main/java/edu/whut/jianshu/Adapter/BookRankAdapter.kt similarity index 95% rename from app/src/main/java/com/zjgsu/jianshu/Adapter/BookRankAdapter.kt rename to app/src/main/java/edu/whut/jianshu/Adapter/BookRankAdapter.kt index 0535ae6..3c9eb0e 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Adapter/BookRankAdapter.kt +++ b/app/src/main/java/edu/whut/jianshu/Adapter/BookRankAdapter.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu.Adapter +package edu.whut.jianshu.Adapter import android.content.Context import android.content.Intent @@ -17,8 +17,12 @@ import cn.bmob.v3.exception.BmobException import cn.bmob.v3.listener.FindListener import cn.bmob.v3.listener.SaveListener import com.bumptech.glide.Glide -import com.zjgsu.jianshu.* -import com.zjgsu.jianshu.Bmob.BookShelf +import edu.whut.jianshu.Activity.BookInformationActivity +import edu.whut.jianshu.Activity.GoodBookActivity +import edu.whut.jianshu.Activity.HotBookActivity +import edu.whut.jianshu.Data.entity.BookShelf +import edu.whut.jianshu.Data.vo.Book_rank +import edu.whut.jianshu.R class BookRankAdapter( private val context: Context, diff --git a/app/src/main/java/com/zjgsu/jianshu/Adapter/Book_authorAdapter.kt b/app/src/main/java/edu/whut/jianshu/Adapter/Book_authorAdapter.kt similarity index 89% rename from app/src/main/java/com/zjgsu/jianshu/Adapter/Book_authorAdapter.kt rename to app/src/main/java/edu/whut/jianshu/Adapter/Book_authorAdapter.kt index 23a15ae..371a593 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Adapter/Book_authorAdapter.kt +++ b/app/src/main/java/edu/whut/jianshu/Adapter/Book_authorAdapter.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu +package edu.whut.jianshu.Adapter import android.content.Intent import android.view.LayoutInflater @@ -12,9 +12,12 @@ import cn.bmob.v3.exception.BmobException import cn.bmob.v3.listener.FindListener import cn.bmob.v3.listener.SaveListener import com.bumptech.glide.Glide -import com.zjgsu.jianshu.Bmob.BookShelf +import edu.whut.jianshu.Activity.BookInformationActivity +import edu.whut.jianshu.Data.entity.BookShelf +import edu.whut.jianshu.Data.vo.BookAuthor +import edu.whut.jianshu.R -class Book_authorAdapter(val authorworkList:List,val userId: String):RecyclerView.Adapter() { +class Book_authorAdapter(val authorworkList:List,val userId: String):RecyclerView.Adapter() { inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) { val workimg: ImageView = view.findViewById(R.id.authorwork_img) val addButton:Button=view.findViewById(R.id.addButton) @@ -63,7 +66,7 @@ class Book_authorAdapter(val authorworkList:List,val userId: String) } }) holder.workimg.setOnClickListener { - val intent= Intent(holder.itemView.context,BookInformationActivity::class.java) + val intent= Intent(holder.itemView.context, BookInformationActivity::class.java) intent.putExtra("Book_name",authorwork.book_name) ContextCompat.startActivity(holder.itemView.context, intent, null) } diff --git a/app/src/main/java/com/zjgsu/jianshu/Adapter/BookshelfAdapter.kt b/app/src/main/java/edu/whut/jianshu/Adapter/BookshelfAdapter.kt similarity index 93% rename from app/src/main/java/com/zjgsu/jianshu/Adapter/BookshelfAdapter.kt rename to app/src/main/java/edu/whut/jianshu/Adapter/BookshelfAdapter.kt index d73be28..1742c9d 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Adapter/BookshelfAdapter.kt +++ b/app/src/main/java/edu/whut/jianshu/Adapter/BookshelfAdapter.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu +package edu.whut.jianshu.Adapter import android.content.Context import android.content.Intent @@ -10,6 +10,11 @@ import android.widget.TextView import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide +import edu.whut.jianshu.Activity.BookInformationActivity +import edu.whut.jianshu.Activity.BookShelfActivity +import edu.whut.jianshu.Activity.MainActivity +import edu.whut.jianshu.Data.vo.Book_Shelf +import edu.whut.jianshu.R //TODO:选中书本的时候书本封面变灰 class BookshelfAdapter(val context: Context, val bookshelf: ArrayList) : RecyclerView.Adapter() { diff --git a/app/src/main/java/com/zjgsu/jianshu/Adapter/CommentAdapter.kt b/app/src/main/java/edu/whut/jianshu/Adapter/CommentAdapter.kt similarity index 95% rename from app/src/main/java/com/zjgsu/jianshu/Adapter/CommentAdapter.kt rename to app/src/main/java/edu/whut/jianshu/Adapter/CommentAdapter.kt index 1edc5ad..d521ed1 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Adapter/CommentAdapter.kt +++ b/app/src/main/java/edu/whut/jianshu/Adapter/CommentAdapter.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu.Adapter +package edu.whut.jianshu.Adapter import android.graphics.Bitmap import android.graphics.BitmapFactory @@ -12,10 +12,10 @@ import androidx.recyclerview.widget.RecyclerView import cn.bmob.v3.BmobQuery import cn.bmob.v3.exception.BmobException import cn.bmob.v3.listener.FindListener -import com.zjgsu.jianshu.Bmob.Comment_bmob -import com.zjgsu.jianshu.Bmob.User_bmob -import com.zjgsu.jianshu.Comment -import com.zjgsu.jianshu.R +import edu.whut.jianshu.Data.entity.Comment_bmob +import edu.whut.jianshu.Data.entity.User_bmob +import edu.whut.jianshu.Data.vo.Comment +import edu.whut.jianshu.R import java.io.InputStream import java.net.HttpURLConnection import java.net.URL diff --git a/app/src/main/java/com/zjgsu/jianshu/Adapter/GoodperceptionAdapter.kt b/app/src/main/java/edu/whut/jianshu/Adapter/GoodperceptionAdapter.kt similarity index 94% rename from app/src/main/java/com/zjgsu/jianshu/Adapter/GoodperceptionAdapter.kt rename to app/src/main/java/edu/whut/jianshu/Adapter/GoodperceptionAdapter.kt index aa6198f..296a261 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Adapter/GoodperceptionAdapter.kt +++ b/app/src/main/java/edu/whut/jianshu/Adapter/GoodperceptionAdapter.kt @@ -1,7 +1,5 @@ -package com.zjgsu.jianshu.Adapter +package edu.whut.jianshu.Adapter -import com.zjgsu.jianshu.Perception -import com.zjgsu.jianshu.R import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -12,8 +10,10 @@ import cn.bmob.v3.BmobQuery import cn.bmob.v3.exception.BmobException import cn.bmob.v3.listener.FindListener import com.bumptech.glide.Glide -import com.zjgsu.jianshu.Bmob.Perception_bmob -import com.zjgsu.jianshu.Bmob.User_bmob +import edu.whut.jianshu.Data.entity.Perception_bmob +import edu.whut.jianshu.Data.entity.User_bmob +import edu.whut.jianshu.Data.vo.Perception +import edu.whut.jianshu.R class GoodperceptionAdapter(val perceptionList: List) : RecyclerView.Adapter() { diff --git a/app/src/main/java/com/zjgsu/jianshu/Adapter/PerceptionAdapter.kt b/app/src/main/java/edu/whut/jianshu/Adapter/PerceptionAdapter.kt similarity index 94% rename from app/src/main/java/com/zjgsu/jianshu/Adapter/PerceptionAdapter.kt rename to app/src/main/java/edu/whut/jianshu/Adapter/PerceptionAdapter.kt index ca41f7d..c30ea89 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Adapter/PerceptionAdapter.kt +++ b/app/src/main/java/edu/whut/jianshu/Adapter/PerceptionAdapter.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu +package edu.whut.jianshu.Adapter import android.content.Intent import android.util.Log @@ -13,10 +13,13 @@ import cn.bmob.v3.BmobQuery import cn.bmob.v3.exception.BmobException import cn.bmob.v3.listener.FindListener import com.bumptech.glide.Glide -import com.zjgsu.jianshu.Activity.Perception_informationActivity -import com.zjgsu.jianshu.Bmob.Book_info_bmob -import com.zjgsu.jianshu.Bmob.Perception_bmob -import com.zjgsu.jianshu.Bmob.User_bmob +import edu.whut.jianshu.Activity.BookInformationActivity +import edu.whut.jianshu.Activity.Perception_informationActivity +import edu.whut.jianshu.Data.entity.Book_info_bmob +import edu.whut.jianshu.Data.entity.Perception_bmob +import edu.whut.jianshu.Data.entity.User_bmob +import edu.whut.jianshu.Data.vo.Perception +import edu.whut.jianshu.R class PerceptionAdapter(val perceptionList: List) : diff --git a/app/src/main/java/com/zjgsu/jianshu/Adapter/send_perceptionAdapter.kt b/app/src/main/java/edu/whut/jianshu/Adapter/send_perceptionAdapter.kt similarity index 95% rename from app/src/main/java/com/zjgsu/jianshu/Adapter/send_perceptionAdapter.kt rename to app/src/main/java/edu/whut/jianshu/Adapter/send_perceptionAdapter.kt index 6046d62..f4cf1f5 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Adapter/send_perceptionAdapter.kt +++ b/app/src/main/java/edu/whut/jianshu/Adapter/send_perceptionAdapter.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu +package edu.whut.jianshu.Adapter import android.graphics.Color import android.view.LayoutInflater @@ -7,6 +7,8 @@ import android.view.ViewGroup import android.widget.* import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide +import edu.whut.jianshu.Data.vo.Book_Shelf +import edu.whut.jianshu.R lateinit var selectedBook:String class send_perceptionAdapter(val bookList:List):RecyclerView.Adapter() { diff --git a/app/src/main/java/com/zjgsu/jianshu/AvatarImageView.java b/app/src/main/java/edu/whut/jianshu/AvatarImageView.java similarity index 55% rename from app/src/main/java/com/zjgsu/jianshu/AvatarImageView.java rename to app/src/main/java/edu/whut/jianshu/AvatarImageView.java index d4b0bba..61bb927 100644 --- a/app/src/main/java/com/zjgsu/jianshu/AvatarImageView.java +++ b/app/src/main/java/edu/whut/jianshu/AvatarImageView.java @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu; +package edu.whut.jianshu; public class AvatarImageView { } diff --git a/app/src/main/java/com/zjgsu/jianshu/Bmob/Author_bmob.kt b/app/src/main/java/edu/whut/jianshu/Data/entity/Author_bmob.kt similarity index 84% rename from app/src/main/java/com/zjgsu/jianshu/Bmob/Author_bmob.kt rename to app/src/main/java/edu/whut/jianshu/Data/entity/Author_bmob.kt index 98445e7..765f240 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Bmob/Author_bmob.kt +++ b/app/src/main/java/edu/whut/jianshu/Data/entity/Author_bmob.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu.Bmob +package edu.whut.jianshu.Data.entity import cn.bmob.v3.BmobObject import cn.bmob.v3.datatype.BmobFile diff --git a/app/src/main/java/com/zjgsu/jianshu/Bmob/BookShelf.kt b/app/src/main/java/edu/whut/jianshu/Data/entity/BookShelf.kt similarity index 90% rename from app/src/main/java/com/zjgsu/jianshu/Bmob/BookShelf.kt rename to app/src/main/java/edu/whut/jianshu/Data/entity/BookShelf.kt index bd1cbc0..57a4004 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Bmob/BookShelf.kt +++ b/app/src/main/java/edu/whut/jianshu/Data/entity/BookShelf.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu.Bmob +package edu.whut.jianshu.Data.entity import cn.bmob.v3.BmobObject diff --git a/app/src/main/java/com/zjgsu/jianshu/Bmob/Book_bmob.kt b/app/src/main/java/edu/whut/jianshu/Data/entity/Book_bmob.kt similarity index 91% rename from app/src/main/java/com/zjgsu/jianshu/Bmob/Book_bmob.kt rename to app/src/main/java/edu/whut/jianshu/Data/entity/Book_bmob.kt index 9dcf28c..20ccaa4 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Bmob/Book_bmob.kt +++ b/app/src/main/java/edu/whut/jianshu/Data/entity/Book_bmob.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu.Bmob +package edu.whut.jianshu.Data.entity import cn.bmob.v3.BmobObject import cn.bmob.v3.datatype.BmobFile diff --git a/app/src/main/java/com/zjgsu/jianshu/Bmob/Book_inf_bmob.kt b/app/src/main/java/edu/whut/jianshu/Data/entity/Book_inf_bmob.kt similarity index 94% rename from app/src/main/java/com/zjgsu/jianshu/Bmob/Book_inf_bmob.kt rename to app/src/main/java/edu/whut/jianshu/Data/entity/Book_inf_bmob.kt index 07a79e0..ad3901c 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Bmob/Book_inf_bmob.kt +++ b/app/src/main/java/edu/whut/jianshu/Data/entity/Book_inf_bmob.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu.Bmob +package edu.whut.jianshu.Data.entity import cn.bmob.v3.BmobObject import cn.bmob.v3.datatype.BmobFile diff --git a/app/src/main/java/com/zjgsu/jianshu/Bmob/Bookcontent_bmob.kt b/app/src/main/java/edu/whut/jianshu/Data/entity/Bookcontent_bmob.kt similarity index 82% rename from app/src/main/java/com/zjgsu/jianshu/Bmob/Bookcontent_bmob.kt rename to app/src/main/java/edu/whut/jianshu/Data/entity/Bookcontent_bmob.kt index 95baf8f..94da854 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Bmob/Bookcontent_bmob.kt +++ b/app/src/main/java/edu/whut/jianshu/Data/entity/Bookcontent_bmob.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu.Bmob +package edu.whut.jianshu.Data.entity import cn.bmob.v3.BmobObject import cn.bmob.v3.datatype.BmobFile diff --git a/app/src/main/java/com/zjgsu/jianshu/Bmob/Comment_bmob.kt b/app/src/main/java/edu/whut/jianshu/Data/entity/Comment_bmob.kt similarity index 80% rename from app/src/main/java/com/zjgsu/jianshu/Bmob/Comment_bmob.kt rename to app/src/main/java/edu/whut/jianshu/Data/entity/Comment_bmob.kt index c1a4f77..af6f5a4 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Bmob/Comment_bmob.kt +++ b/app/src/main/java/edu/whut/jianshu/Data/entity/Comment_bmob.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu.Bmob +package edu.whut.jianshu.Data.entity import cn.bmob.v3.BmobObject diff --git a/app/src/main/java/com/zjgsu/jianshu/Bmob/Perception_bmob.kt b/app/src/main/java/edu/whut/jianshu/Data/entity/Perception_bmob.kt similarity index 85% rename from app/src/main/java/com/zjgsu/jianshu/Bmob/Perception_bmob.kt rename to app/src/main/java/edu/whut/jianshu/Data/entity/Perception_bmob.kt index abce4b3..f70043a 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Bmob/Perception_bmob.kt +++ b/app/src/main/java/edu/whut/jianshu/Data/entity/Perception_bmob.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu.Bmob +package edu.whut.jianshu.Data.entity import cn.bmob.v3.BmobObject class Perception_bmob:BmobObject() { diff --git a/app/src/main/java/com/zjgsu/jianshu/Bmob/User_bmob.kt b/app/src/main/java/edu/whut/jianshu/Data/entity/User_bmob.kt similarity index 97% rename from app/src/main/java/com/zjgsu/jianshu/Bmob/User_bmob.kt rename to app/src/main/java/edu/whut/jianshu/Data/entity/User_bmob.kt index c4a1693..173771f 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Bmob/User_bmob.kt +++ b/app/src/main/java/edu/whut/jianshu/Data/entity/User_bmob.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu.Bmob +package edu.whut.jianshu.Data.entity import cn.bmob.v3.BmobObject import cn.bmob.v3.datatype.BmobFile diff --git a/app/src/main/java/com/zjgsu/jianshu/Book.kt b/app/src/main/java/edu/whut/jianshu/Data/vo/Book.kt similarity index 72% rename from app/src/main/java/com/zjgsu/jianshu/Book.kt rename to app/src/main/java/edu/whut/jianshu/Data/vo/Book.kt index f123e90..b765e5d 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Book.kt +++ b/app/src/main/java/edu/whut/jianshu/Data/vo/Book.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu +package edu.whut.jianshu.Data.vo class Book( diff --git a/app/src/main/java/edu/whut/jianshu/Data/vo/BookAuthor.kt b/app/src/main/java/edu/whut/jianshu/Data/vo/BookAuthor.kt new file mode 100644 index 0000000..ccd924f --- /dev/null +++ b/app/src/main/java/edu/whut/jianshu/Data/vo/BookAuthor.kt @@ -0,0 +1,3 @@ +package edu.whut.jianshu.Data.vo + +class BookAuthor(val book_name:String,val author_name:String,val bookurl:String) \ No newline at end of file diff --git a/app/src/main/java/com/zjgsu/jianshu/Book_Shelf.kt b/app/src/main/java/edu/whut/jianshu/Data/vo/Book_Shelf.kt similarity index 62% rename from app/src/main/java/com/zjgsu/jianshu/Book_Shelf.kt rename to app/src/main/java/edu/whut/jianshu/Data/vo/Book_Shelf.kt index 5b287b1..4dddb7a 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Book_Shelf.kt +++ b/app/src/main/java/edu/whut/jianshu/Data/vo/Book_Shelf.kt @@ -1,3 +1,3 @@ -package com.zjgsu.jianshu +package edu.whut.jianshu.Data.vo class Book_Shelf(val bkname:String,val picurl:String) \ No newline at end of file diff --git a/app/src/main/java/com/zjgsu/jianshu/Book_rank.kt b/app/src/main/java/edu/whut/jianshu/Data/vo/Book_rank.kt similarity index 86% rename from app/src/main/java/com/zjgsu/jianshu/Book_rank.kt rename to app/src/main/java/edu/whut/jianshu/Data/vo/Book_rank.kt index 69b691e..e3c7081 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Book_rank.kt +++ b/app/src/main/java/edu/whut/jianshu/Data/vo/Book_rank.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu +package edu.whut.jianshu.Data.vo class Book_rank(var name: String, var picUrl: String, diff --git a/app/src/main/java/com/zjgsu/jianshu/Book_video.kt b/app/src/main/java/edu/whut/jianshu/Data/vo/Book_video.kt similarity index 77% rename from app/src/main/java/com/zjgsu/jianshu/Book_video.kt rename to app/src/main/java/edu/whut/jianshu/Data/vo/Book_video.kt index 0e8995c..591c2fe 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Book_video.kt +++ b/app/src/main/java/edu/whut/jianshu/Data/vo/Book_video.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu +package edu.whut.jianshu.Data.vo import cn.bmob.v3.datatype.BmobFile diff --git a/app/src/main/java/com/zjgsu/jianshu/Comment.kt b/app/src/main/java/edu/whut/jianshu/Data/vo/Comment.kt similarity index 52% rename from app/src/main/java/com/zjgsu/jianshu/Comment.kt rename to app/src/main/java/edu/whut/jianshu/Data/vo/Comment.kt index 1d1e238..bbbfeae 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Comment.kt +++ b/app/src/main/java/edu/whut/jianshu/Data/vo/Comment.kt @@ -1,3 +1,3 @@ -package com.zjgsu.jianshu +package edu.whut.jianshu.Data.vo class Comment(val commentid:String) \ No newline at end of file diff --git a/app/src/main/java/com/zjgsu/jianshu/Perception.kt b/app/src/main/java/edu/whut/jianshu/Data/vo/Perception.kt similarity index 56% rename from app/src/main/java/com/zjgsu/jianshu/Perception.kt rename to app/src/main/java/edu/whut/jianshu/Data/vo/Perception.kt index ec20a64..1ea905b 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Perception.kt +++ b/app/src/main/java/edu/whut/jianshu/Data/vo/Perception.kt @@ -1,3 +1,3 @@ -package com.zjgsu.jianshu +package edu.whut.jianshu.Data.vo class Perception(val perceptionid:String) \ No newline at end of file diff --git a/app/src/main/java/com/zjgsu/jianshu/DragableLuncher.java b/app/src/main/java/edu/whut/jianshu/DragableLuncher.java similarity index 99% rename from app/src/main/java/com/zjgsu/jianshu/DragableLuncher.java rename to app/src/main/java/edu/whut/jianshu/DragableLuncher.java index b5fb6dc..f997c41 100644 --- a/app/src/main/java/com/zjgsu/jianshu/DragableLuncher.java +++ b/app/src/main/java/edu/whut/jianshu/DragableLuncher.java @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu; +package edu.whut.jianshu; import android.content.Context; import android.util.AttributeSet; import android.view.MotionEvent; diff --git a/app/src/main/java/com/zjgsu/jianshu/Fragment/ContentFragment.kt b/app/src/main/java/edu/whut/jianshu/Fragment/ContentFragment.kt similarity index 96% rename from app/src/main/java/com/zjgsu/jianshu/Fragment/ContentFragment.kt rename to app/src/main/java/edu/whut/jianshu/Fragment/ContentFragment.kt index b80bc0d..b2d3b82 100644 --- a/app/src/main/java/com/zjgsu/jianshu/Fragment/ContentFragment.kt +++ b/app/src/main/java/edu/whut/jianshu/Fragment/ContentFragment.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu.Fragment +package edu.whut.jianshu.Fragment import android.os.Bundle import android.view.LayoutInflater @@ -6,7 +6,7 @@ import android.view.View import android.view.ViewGroup import android.widget.TextView import androidx.fragment.app.Fragment -import com.zjgsu.jianshu.R +import edu.whut.jianshu.R class BookPageFragment : Fragment() { private var bookContent: String? = null diff --git a/app/src/main/java/com/zjgsu/jianshu/MyDialog.java b/app/src/main/java/edu/whut/jianshu/MyDialog.java similarity index 99% rename from app/src/main/java/com/zjgsu/jianshu/MyDialog.java rename to app/src/main/java/edu/whut/jianshu/MyDialog.java index 7f31d80..d98ec8d 100644 --- a/app/src/main/java/com/zjgsu/jianshu/MyDialog.java +++ b/app/src/main/java/edu/whut/jianshu/MyDialog.java @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu; +package edu.whut.jianshu; import android.app.Dialog; import android.content.Context; @@ -13,6 +13,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; + public class MyDialog extends Dialog implements View.OnClickListener { //声明xml文件里的组件 private TextView tv_title,tv_message; diff --git a/app/src/main/java/com/zjgsu/jianshu/NavigationHelper.kt b/app/src/main/java/edu/whut/jianshu/NavigationHelper.kt similarity index 92% rename from app/src/main/java/com/zjgsu/jianshu/NavigationHelper.kt rename to app/src/main/java/edu/whut/jianshu/NavigationHelper.kt index 8f35b37..0f937a7 100644 --- a/app/src/main/java/com/zjgsu/jianshu/NavigationHelper.kt +++ b/app/src/main/java/edu/whut/jianshu/NavigationHelper.kt @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu +package edu.whut.jianshu import android.content.Intent import androidx.appcompat.app.AppCompatActivity diff --git a/app/src/main/java/com/zjgsu/jianshu/showPopupcomment.java b/app/src/main/java/edu/whut/jianshu/showPopupcomment.java similarity index 99% rename from app/src/main/java/com/zjgsu/jianshu/showPopupcomment.java rename to app/src/main/java/edu/whut/jianshu/showPopupcomment.java index f8bed2a..2c9aa6d 100644 --- a/app/src/main/java/com/zjgsu/jianshu/showPopupcomment.java +++ b/app/src/main/java/edu/whut/jianshu/showPopupcomment.java @@ -1,4 +1,4 @@ -package com.zjgsu.jianshu; +package edu.whut.jianshu; import android.annotation.SuppressLint; import android.content.Context; diff --git a/app/src/test/java/com/zjgsu/jianshu/ExampleUnitTest.kt b/app/src/test/java/com/zjgsu/jianshu/ExampleUnitTest.kt deleted file mode 100644 index d9fca04..0000000 --- a/app/src/test/java/com/zjgsu/jianshu/ExampleUnitTest.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.zjgsu.jianshu - -import org.junit.Test - -import org.junit.Assert.* - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} \ No newline at end of file