diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index b7ddd75..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -orangesale \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 1671a39..19e66b2 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,44 +1,5 @@ - - - - @@ -66,7 +27,7 @@ - + diff --git a/README.md b/README.md deleted file mode 100644 index a8988a1..0000000 --- a/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# AndroidProject - diff --git a/app/build.gradle b/app/build.gradle index bcb3316..6ca543d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,7 +4,7 @@ android { compileSdkVersion 29 buildToolsVersion "29.0.2" defaultConfig { - applicationId "com.orangesale.cn" + applicationId "com.jxust.chapter9_okhttp" minSdkVersion 26 targetSdkVersion 29 versionCode 1 @@ -17,22 +17,16 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } - compileOptions { - sourceCompatibility = 1.8 - targetCompatibility = 1.8 - } } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'androidx.appcompat:appcompat:1.1.0' /*引入OkHTTP*/ implementation "com.squareup.okhttp3:okhttp:4.2.2" - implementation group: 'com.alibaba', name: 'fastjson', version: '1.2.12' implementation 'org.conscrypt:conscrypt-android:2.2.1' - implementation 'androidx.appcompat:appcompat:1.0.2' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' - implementation 'liji.library.dev:citypickerview:1.1.0' } diff --git a/app/src/androidTest/java/com/orangesale/cn/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/orangesale/cn/ExampleInstrumentedTest.java deleted file mode 100644 index 713d673..0000000 --- a/app/src/androidTest/java/com/orangesale/cn/ExampleInstrumentedTest.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.orangesale.cn; - -import android.content.Context; - -import androidx.test.platform.app.InstrumentationRegistry; -import androidx.test.ext.junit.runners.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.*; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith(AndroidJUnit4.class) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - - assertEquals("com.orangesale.cn", appContext.getPackageName()); - } -} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e8bc712..a479fc0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="com.jxust.chapter9_okhttp"> + - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/jxust/chapter9_okhttp/MainActivity.java b/app/src/main/java/com/jxust/chapter9_okhttp/MainActivity.java new file mode 100644 index 0000000..0f6a899 --- /dev/null +++ b/app/src/main/java/com/jxust/chapter9_okhttp/MainActivity.java @@ -0,0 +1,124 @@ +package com.jxust.chapter9_okhttp; + +import androidx.appcompat.app.AppCompatActivity; + +import android.os.Bundle; +import android.widget.TextView; + +import org.jetbrains.annotations.NotNull; + +import java.io.IOException; + +import okhttp3.Call; +import okhttp3.Callback; +import okhttp3.Headers; +import okhttp3.MediaType; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.RequestBody; +import okhttp3.Response; + +public class MainActivity extends AppCompatActivity { + private TextView textView; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + textView = findViewById(R.id.texts); + //getDataFromBD(); + //getDataBDAsync(); + postaAsync(); + } + + /** + * 使用okhttp获取百度信息 + * get的同步请求 + * 对于同步请求在请求时需要开启子线程，请求成功后需要跳转到UI线程修改UI。 + */ + private void getDataFromBD() { + new Thread(new Runnable() { + @Override + public void run() { + try { + OkHttpClient okHttpClient = new OkHttpClient(); + Request request = new Request.Builder() + .url("http://www.baidu.com/") + .build(); + Response response; + response = okHttpClient.newCall(request).execute(); + if (response.isSuccessful()) { + showResponse(response.message() + "\n" + response.body().string()); + } + } catch (IOException e) { + e.printStackTrace(); + } + + } + }).start(); + } + + /** + * get异步方式 + * 这种方式不用再次开启子线程，但回调方法是执行在子线程中，所以在更新UI时还要跳转到UI线程中 + */ + private void getDataBDAsync() { + OkHttpClient client = new OkHttpClient(); + Request request = new Request.Builder() + .url("http://www.baidu.com") + .build(); + client.newCall(request).enqueue(new Callback() { + @Override + public void onFailure(@NotNull Call call, @NotNull IOException e) { + + } + + @Override + public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException { + if (response.isSuccessful()) { + showResponse(response.message() + response.body().string()); + } + } + }); + } + + /** + * post异步方式 + */ + private void postaAsync() { + MediaType mediaType = MediaType.parse("text/x-markdown; charset=utf-8"); + String requestBody = "test okhttp"; + Request request = new Request.Builder() + .url("https://api.github.com/markdown/raw") + .post(RequestBody.create(mediaType, requestBody)) + .build(); + OkHttpClient okHttpClient = new OkHttpClient(); + okHttpClient.newCall(request).enqueue(new Callback() { + @Override + public void onFailure(Call call, IOException e) { + } + + @Override + public void onResponse(Call call, Response response) throws IOException { + Headers headers = response.headers(); + showResponse(headers.toString()); + } + }); + } + + + /** + * 组件显示结果 + * + * @param response + */ + private void showResponse(final String response) { + runOnUiThread(new Runnable() { + @Override + public void run() { + textView.setText(response); + } + }); + } + +} diff --git a/app/src/main/java/com/orangesale/cn/MainActivity.java b/app/src/main/java/com/orangesale/cn/MainActivity.java deleted file mode 100644 index 19de626..0000000 --- a/app/src/main/java/com/orangesale/cn/MainActivity.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.orangesale.cn; - -import android.content.Intent; -import android.database.Cursor; -import android.database.sqlite.SQLiteDatabase; -import android.os.Bundle; -import android.os.Looper; -import android.view.View; -import android.widget.Button; -import android.widget.EditText; -import android.widget.Toast; - -import androidx.appcompat.app.AppCompatActivity; - -import com.orangesale.cn.activity.IndexActivity; -import com.orangesale.cn.activity.RegisterActivity; -import com.orangesale.cn.dataoperation.OrangeDatabase; -import com.orangesale.cn.entity.OrangeUser; -import com.orangesale.cn.netrequest.OkHttpUser; - -import java.io.IOException; - -public class MainActivity extends AppCompatActivity implements View.OnClickListener { - private Button registerButton, loginButton; - private EditText usernameText, paswdEdit; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.user_login); - init(); - } - - @Override - public void onClick(View v) { - switch (v.getId()) { - case R.id.register: - Intent intent = new Intent(MainActivity.this, RegisterActivity.class); - startActivity(intent); - break; - case R.id.login: - //注册时，我们引入了数据库，登录这里可以通过数据库进行验证，验证跳转到首页，不通过进行提示 - Thread thread = new Thread(runnable); - thread.start(); - break; - } - - } - - //界面组件初始化 - private void init() { - usernameText = findViewById(R.id.username); - paswdEdit = findViewById(R.id.password); - loginButton = findViewById(R.id.login); - loginButton.setOnClickListener(this); - registerButton = findViewById(R.id.register); - registerButton.setOnClickListener(this); - } - - /** - * 登录验证 - * - * @return - */ - private boolean validateLogin() { - String username = usernameText.getText().toString(); - String password = paswdEdit.getText().toString(); - OrangeDatabase orangeDatabase = new OrangeDatabase(MainActivity.this); - SQLiteDatabase sqLiteDatabase = orangeDatabase.getReadableDatabase(); - Cursor cursor = sqLiteDatabase.rawQuery("select * from orange_user where username=? and password=?", new String[]{username, password}); - if (cursor.getCount() > 0) { - return true; - } - return false; - } - - /** - * 登录验证 - */ - Runnable runnable = new Runnable() { - @Override - public void run() { - String username = usernameText.getText().toString(); - String password = paswdEdit.getText().toString(); - OrangeUser orangeUser = new OrangeUser(); - orangeUser.setUsername(username); - orangeUser.setPassword(password); - OkHttpUser okHttpUser = new OkHttpUser(); - OrangeUser orangeUser1 = null; - try { - orangeUser1 = okHttpUser.userLogin(orangeUser); - if (orangeUser1 != null) { - Intent intent1 = new Intent(MainActivity.this, IndexActivity.class); - Bundle bundle = new Bundle(); - bundle.putString("username", usernameText.getText().toString()); - bundle.putString("password", orangeUser1.getPassword()); - bundle.putString("city", orangeUser1.getCity()); - bundle.putString("sex", orangeUser1.getSex()); - intent1.putExtras(bundle); - startActivity(intent1); - } else { - //解决在子线程中调用Toast的异常情况处理 - Looper.prepare(); - Toast.makeText(MainActivity.this, "账号或者密码错误", Toast.LENGTH_SHORT).show(); - Looper.loop(); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - }; -} diff --git a/app/src/main/java/com/orangesale/cn/activity/CategoryActivity.java b/app/src/main/java/com/orangesale/cn/activity/CategoryActivity.java deleted file mode 100644 index af5b6bc..0000000 --- a/app/src/main/java/com/orangesale/cn/activity/CategoryActivity.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.orangesale.cn.activity; - -import android.app.Activity; -import android.app.FragmentManager; -import android.app.FragmentTransaction; -import android.os.Bundle; -import android.widget.ListView; - -import androidx.annotation.Nullable; - -import com.orangesale.cn.R; -import com.orangesale.cn.adapter.Adapter; -import com.orangesale.cn.entity.Product; -import com.orangesale.cn.fragment.SetDetailFragment; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; - - -public class CategoryActivity extends Activity { - public OnChangeListener onchangedListener; - private List productList; - private List productCategory = new ArrayList<>(); - private ListView titleList; - private Adapter adapter; - - @Override - public void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.content_category); - initData(); - init(); - SetDetailFragment fragment = new SetDetailFragment(); - FragmentManager fragmentManager = getFragmentManager(); - FragmentTransaction transaction = fragmentManager.beginTransaction(); - transaction.replace(R.id.category_detail, fragment); - transaction.commit(); - titleList.setOnItemClickListener((parent, view, position, id) -> { - adapter.setSelectedPosition(position); - adapter.notifyDataSetInvalidated(); - if (onchangedListener != null) { - onchangedListener.changeText(productList.get(position)); - } - }); - - } - - public void setOnChangeListener(OnChangeListener onChangeListener) { - this.onchangedListener = onChangeListener; - } - - public interface OnChangeListener { - void changeText(Product product); - } - - /** - * 初始化数据 - */ - private void initData() { - productList = new ArrayList<>(); - productCategory.add("橘子"); - productCategory.add("橙子"); - productCategory.add("柚子"); - Product product = new Product(); - product.setImageUrlId(R.drawable.arrow_down); - product.setProductName("橘子"); - product.setProductPrice(new BigDecimal("9.9")); - Product product1 = new Product(); - product1.setImageUrlId(R.drawable.orange); - product1.setProductName("橙子"); - product1.setProductPrice(new BigDecimal("29.9")); - Product product2 = new Product(); - product2.setImageUrlId(R.drawable.arrow_left); - product2.setProductName("柚子"); - product2.setProductPrice(new BigDecimal("19.9")); - productList.add(product); - productList.add(product1); - productList.add(product2); - } - - /** - * 初始化组件 - */ - private void init() { - titleList = findViewById(R.id.category_title_list); - adapter = new Adapter(productCategory, CategoryActivity.this); - titleList.setAdapter(adapter); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/orangesale/cn/activity/IndexActivity.java b/app/src/main/java/com/orangesale/cn/activity/IndexActivity.java deleted file mode 100644 index 3d8ae47..0000000 --- a/app/src/main/java/com/orangesale/cn/activity/IndexActivity.java +++ /dev/null @@ -1,128 +0,0 @@ -package com.orangesale.cn.activity; - -import android.app.Activity; -import android.app.FragmentTransaction; -import android.content.Intent; -import android.os.Bundle; -import android.view.View; -import android.widget.LinearLayout; - -import androidx.annotation.Nullable; - -import com.orangesale.cn.R; -import com.orangesale.cn.fragment.IndexFragment; -import com.orangesale.cn.fragment.PearsonFragment; -import com.orangesale.cn.fragment.ProductFragment; -import com.orangesale.cn.fragment.ShoppingCartFragment; -import com.orangesale.cn.service.TimeService; - -public class IndexActivity extends Activity implements View.OnClickListener { - private IndexFragment indexFragment; - private ProductFragment productFragment; - private ShoppingCartFragment shoppingCartFragment; - private PearsonFragment pearsonFragment; - private LinearLayout indexLine, productLine, shoppingCartLine, pearsonLine; - - @Override - public void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - init(); - initIndexFragment(); - Thread thread = new Thread(runnable); - thread.start(); - } - - /** - * 组件初始化 - */ - private void init() { - indexLine = findViewById(R.id.content_index); - indexLine.setOnClickListener(this); - productLine = findViewById(R.id.content_product); - productLine.setOnClickListener(this); - shoppingCartLine = findViewById(R.id.content_cart); - shoppingCartLine.setOnClickListener(this); - pearsonLine = findViewById(R.id.content_pearson); - pearsonLine.setOnClickListener(this); - } - - @Override - public void onClick(View v) { - switch (v.getId()) { - case R.id.content_index: - initIndexFragment(); - break; - case R.id.content_product: - initproductFragment(); - break; - case R.id.content_cart: - initshoppingCartFragment(); - break; - case R.id.content_pearson: - initpearsonFragment(); - break; - } - } - - /** - * 初始化首页Fragment - */ - private void initIndexFragment() { - //开启事务，fragment的控制是由事务来实现的 - FragmentTransaction transaction = getFragmentManager().beginTransaction(); - if (indexFragment == null) { - indexFragment = new IndexFragment(); - } - transaction.replace(R.id.main_content, indexFragment); - transaction.commit(); - } - - /** - * 初始化产品Fragment - */ - private void initproductFragment() { - //开启事务，fragment的控制是由事务来实现的 - FragmentTransaction transaction = getFragmentManager().beginTransaction(); - if (productFragment == null) { - productFragment = new ProductFragment(); - } - transaction.replace(R.id.main_content, productFragment); - transaction.commit(); - } - - /** - * 初始化购物车Fragment - */ - private void initshoppingCartFragment() { - //开启事务，fragment的控制是由事务来实现的 - FragmentTransaction transaction = getFragmentManager().beginTransaction(); - if (shoppingCartFragment == null) { - shoppingCartFragment = new ShoppingCartFragment(); - } - transaction.replace(R.id.main_content, shoppingCartFragment); - transaction.commit(); - } - - /** - * 初始化个人Fragment - */ - private void initpearsonFragment() { - //开启事务，fragment的控制是由事务来实现的 - FragmentTransaction transaction = getFragmentManager().beginTransaction(); - if (pearsonFragment == null) { - Intent intent = IndexActivity.this.getIntent(); - Bundle bundle = intent.getExtras(); - pearsonFragment = new PearsonFragment(); - pearsonFragment.setArguments(bundle); - } - transaction.replace(R.id.main_content, pearsonFragment); - transaction.commit(); - } - - Runnable runnable = () -> { - Intent intent = new Intent(IndexActivity.this, TimeService.class); - startService(intent); - }; - -} diff --git a/app/src/main/java/com/orangesale/cn/activity/RegisterActivity.java b/app/src/main/java/com/orangesale/cn/activity/RegisterActivity.java deleted file mode 100644 index 2bcc114..0000000 --- a/app/src/main/java/com/orangesale/cn/activity/RegisterActivity.java +++ /dev/null @@ -1,176 +0,0 @@ -package com.orangesale.cn.activity; - -import android.content.Intent; -import android.graphics.Color; -import android.os.Bundle; -import android.os.Looper; -import android.view.View; -import android.widget.Button; -import android.widget.EditText; -import android.widget.RadioGroup; -import android.widget.TextView; -import android.widget.Toast; - -import androidx.annotation.Nullable; -import androidx.appcompat.app.AppCompatActivity; - -import com.lljjcoder.citypickerview.widget.CityPicker; -import com.orangesale.cn.R; -import com.orangesale.cn.entity.OrangeUser; -import com.orangesale.cn.netrequest.OkHttpUser; - -import java.io.IOException; - -public class RegisterActivity extends AppCompatActivity implements View.OnClickListener, RadioGroup.OnCheckedChangeListener { - private EditText usernameEdit, passwordEdit, surePasswordEdit; - private TextView cityText; - private CityPicker cityPicker; - private Button regButton; - private RadioGroup sexGroup; - private String sexStr = "男"; - - - @Override - protected void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.user_register); - init(); - } - - /** - * 界面组件初始化 - */ - private void init() { - cityText = findViewById(R.id.reg_province); - cityText.setOnClickListener(this); - usernameEdit = findViewById(R.id.reg_username); - passwordEdit = findViewById(R.id.reg_password); - surePasswordEdit = findViewById(R.id.reg_sure_password); - regButton = findViewById(R.id.reg_register); - regButton.setOnClickListener(this); - sexGroup = findViewById(R.id.sex); - sexGroup.setOnCheckedChangeListener(this); - - } - - @Override - public void onClick(View v) { - switch (v.getId()) { - case R.id.reg_province: - initCityPicker(); - cityPicker.show(); - break; - case R.id.reg_register: - //注册验证方法 - //validateRegister(); - Thread thread = new Thread(runnable); - thread.start(); - break; - - } - } - - /** - * 初始化城市选择器 - */ - public void initCityPicker() { - cityPicker = new CityPicker.Builder(RegisterActivity.this) - .textSize(16) - .title("地址选择") - .backgroundPop(0xa0000000) - .titleBackgroundColor("#EFB81C") - .titleTextColor("#000000") - .backgroundPop(0xa0000000) - .confirTextColor("#000000") - .cancelTextColor("#000000") - .province("江西省") - .city("赣州市") - .district("章贡区") - .textColor(Color.parseColor("#000000")) - .provinceCyclic(true) - .cityCyclic(false) - .districtCyclic(false) - .visibleItemsCount(7) - .itemPadding(10) - .onlyShowProvinceAndCity(false) - .build(); - cityPicker.setOnCityItemClickListener(new CityPicker.OnCityItemClickListener() { - @Override - public void onSelected(String... strings) { - String province = strings[0]; - String city = strings[1]; - String district = strings[2]; - cityText.setText(String.format("%s %s %s", province, city, district)); - } - - @Override - public void onCancel() { - } - }); - - } - - @Override - public void onCheckedChanged(RadioGroup group, int checkedId) { - //根据用户选择来改变sex的值 - sexStr = checkedId == R.id.reg_man ? "男" : "女"; - } - - /** - * 注册验证 - */ - Runnable runnable = new Runnable() { - @Override - public void run() { - String username = usernameEdit.getText().toString(); - String password = passwordEdit.getText().toString(); - String surePassword = surePasswordEdit.getText().toString(); - String city = cityText.getText().toString(); - //判断两次密码是否输入一致 - if (password.equals(surePassword)) { - //这里也可以再进行其它的验证，如是否符合要求等，符合就进行插入数据库操作 - if (!username.equals("") || !password.equals("")) { - if (!city.equals("")) { - Bundle bundle = new Bundle(); - bundle.putString("username", username); - bundle.putString("password", password); - bundle.putString("sex", sexStr); - bundle.putString("city", city); - OrangeUser orangeUser = new OrangeUser(); - orangeUser.setUsername(username); - orangeUser.setPassword(password); - orangeUser.setCity(city); - orangeUser.setSex(sexStr); - //将使用安卓自身带的SQLite数据库换成调用okhttp的方式 - OkHttpUser okHttpUser = new OkHttpUser(); - try { - if (okHttpUser.userRegister(orangeUser)) { - Intent intent = new Intent(RegisterActivity.this, IndexActivity.class); - intent.putExtras(bundle); - startActivity(intent); - } else { - Looper.prepare(); - Toast.makeText(RegisterActivity.this, "注册失败！", Toast.LENGTH_SHORT).show(); - Looper.loop(); - } - } catch (IOException e) { - e.printStackTrace(); - } - } else { - Looper.prepare(); - Toast.makeText(RegisterActivity.this, "请选择地址", Toast.LENGTH_SHORT).show(); - Looper.loop(); - } - } else { - Looper.prepare(); - Toast.makeText(RegisterActivity.this, "账号或密码未填写", Toast.LENGTH_SHORT).show(); - Looper.loop(); - } - } else { - Looper.prepare(); - Toast.makeText(RegisterActivity.this, "两次密码输入不一致", Toast.LENGTH_SHORT).show(); - Looper.loop(); - } - } - }; -} diff --git a/app/src/main/java/com/orangesale/cn/activity/UserActivity.java b/app/src/main/java/com/orangesale/cn/activity/UserActivity.java deleted file mode 100644 index 21e5ea6..0000000 --- a/app/src/main/java/com/orangesale/cn/activity/UserActivity.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.orangesale.cn.activity; - -import android.app.Activity; -import android.content.Intent; -import android.os.Bundle; -import android.view.View; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.orangesale.cn.R; - -public class UserActivity extends Activity implements View.OnClickListener { - private ImageView userIconImage; - private TextView usernameText, userSexText, userCityText; - private LinearLayout usernameLine, userSexline, userCityLine, userPayLine, userSettingLine, userGeneralLine, userSearchProductLine; - - @Override - protected void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.content_user); - init(); - } - - /** - * 组件初始化 - */ - private void init() { - userIconImage = findViewById(R.id.user_icon); - usernameText = findViewById(R.id.user_username); - userSexText = findViewById(R.id.user_sex); - userCityText = findViewById(R.id.user_city); - usernameLine = findViewById(R.id.user_username_line); - userSexline = findViewById(R.id.user_sex_line); - userCityLine = findViewById(R.id.user_city_line); - userPayLine = findViewById(R.id.user_pay); - userSettingLine = findViewById(R.id.user_setting); - userGeneralLine = findViewById(R.id.user_general); -// userSearchProductLine = findViewById(R.id.user_searchProduct); - userSearchProductLine.setOnClickListener(this); - setData(); - } - - /** - * 组件赋值 - */ - private void setData() { - Intent intent = UserActivity.this.getIntent(); - Bundle bundle = intent.getExtras(); - usernameText.setText(String.format("用户名：%s", bundle.getString("username"))); - userSexText.setText(String.format("性别：%s", bundle.getString("sex"))); - userCityText.setText(String.format("城市：%s", bundle.getString("city"))); - } - - @Override - public void onClick(View v) { - switch (v.getId()) { - /*case R.id.user_searchProduct: - Intent intent1 = new Intent(UserActivity.this, CategoryActivity.class); - startActivity(intent1); - break;*/ - } - } -} diff --git a/app/src/main/java/com/orangesale/cn/adapter/Adapter.java b/app/src/main/java/com/orangesale/cn/adapter/Adapter.java deleted file mode 100644 index 95f6552..0000000 --- a/app/src/main/java/com/orangesale/cn/adapter/Adapter.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.orangesale.cn.adapter; - -import android.content.Context; -import android.graphics.Color; -import android.util.Log; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.TextView; - -import com.orangesale.cn.R; - -import java.util.List; - -public class Adapter extends BaseAdapter { - private List productCategory; - private LayoutInflater layoutInflater; - private int selectionPosition = -1; - - public Adapter(List productCategory, Context context) { - this.productCategory = productCategory; - this.layoutInflater = LayoutInflater.from(context); - } - - @Override - public int getCount() { - return productCategory.size(); - } - - @Override - public Object getItem(int position) { - return productCategory.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ViewHolder viewHolder = null; - if (convertView == null) { - viewHolder = new ViewHolder(); - convertView = layoutInflater.inflate(R.layout.category_list_item, null); - Log.i("adapts", "getView: " + convertView); - viewHolder.tv = convertView.findViewById(R.id.categor_titles); - convertView.setTag(viewHolder); - } else { - viewHolder = (ViewHolder) convertView.getTag(); - } - viewHolder.tv.setText(productCategory.get(position)); - if (selectionPosition == position) { - viewHolder.tv.setBackgroundColor(Color.YELLOW); - } else { - viewHolder.tv.setBackgroundColor(Color.WHITE); - } - return convertView; - } - - public void setSelectedPosition(int position) { - this.selectionPosition = position; - } - - class ViewHolder { - TextView tv; - } -} diff --git a/app/src/main/java/com/orangesale/cn/adapter/ListViewAdapter.java b/app/src/main/java/com/orangesale/cn/adapter/ListViewAdapter.java deleted file mode 100644 index 8eb7172..0000000 --- a/app/src/main/java/com/orangesale/cn/adapter/ListViewAdapter.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.orangesale.cn.adapter; - -import android.content.Context; -import android.graphics.Color; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.TextView; - -import com.orangesale.cn.R; -import com.orangesale.cn.entity.Condition; - -import java.util.List; - -public class ListViewAdapter extends BaseAdapter { - private List conditionList; - private LayoutInflater layoutInflater; - private int selectedPosition = -1; - private int selectColor = Color.GRAY; - - public ListViewAdapter(Context context, List conditionList) { - this.conditionList = conditionList; - this.layoutInflater = LayoutInflater.from(context); - } - - @Override - public int getCount() { - return conditionList.size(); - } - - @Override - public Object getItem(int position) { - return conditionList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ViewHolder viewHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.product_condition_item, null); - viewHolder = new ViewHolder(); - viewHolder.imageView = convertView.findViewById(R.id.condition_icon); - viewHolder.jiange = convertView.findViewById(R.id.image_jiange); - viewHolder.textView = convertView.findViewById(R.id.condition_name); - viewHolder.linearLayout = convertView.findViewById(R.id.item_bg); - convertView.setTag(viewHolder); - } else { - viewHolder = (ViewHolder) convertView.getTag(); - } - Condition condition = conditionList.get(position); - if (condition != null) { - viewHolder.imageView.setBackgroundResource(condition.getConditionIcon()); - viewHolder.textView.setText(condition.getConditionName()); - viewHolder.jiange.setBackgroundColor(Color.rgb(207, 207, 207)); - if (selectedPosition == position) { - viewHolder.linearLayout.setBackgroundColor(selectColor); - } - - } - return convertView; - } - - class ViewHolder { - ImageView imageView, jiange; - TextView textView; - LinearLayout linearLayout; - } - - -} diff --git a/app/src/main/java/com/orangesale/cn/adapter/ProductAdapter.java b/app/src/main/java/com/orangesale/cn/adapter/ProductAdapter.java deleted file mode 100644 index 30f5558..0000000 --- a/app/src/main/java/com/orangesale/cn/adapter/ProductAdapter.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.orangesale.cn.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; -import android.widget.TextView; - -import com.orangesale.cn.R; -import com.orangesale.cn.entity.OrangeProductPack; - -import java.util.List; - -public class ProductAdapter extends BaseAdapter { - //private List productList; - private List orangeProductList; - private LayoutInflater layoutInflater; - - public ProductAdapter(Context context, List orangeProductList) { - this.orangeProductList = orangeProductList; - this.layoutInflater = LayoutInflater.from(context); - } - - @Override - public int getCount() { - return orangeProductList.size(); - } - - @Override - public Object getItem(int position) { - return orangeProductList.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - ViewHolder viewHolder; - if (convertView == null) { - convertView = layoutInflater.inflate(R.layout.categoty_detail_content, null); - viewHolder = new ViewHolder(); - viewHolder.productImage = convertView.findViewById(R.id.category_product_image); - viewHolder.productName = convertView.findViewById(R.id.category_product_name); - viewHolder.productPrice = convertView.findViewById(R.id.category_product_price); - convertView.setTag(viewHolder); - } else { - viewHolder = (ViewHolder) convertView.getTag(); - } - OrangeProductPack product = orangeProductList.get(position); - if (product != null) { - viewHolder.productImage.setImageBitmap(product.getImgBitmap()); - viewHolder.productName.setText(product.getName()); - viewHolder.productPrice.setText(String.format("%s元", String.valueOf(product.getPrice()))); - } - return convertView; - } - - class ViewHolder { - ImageView productImage; - TextView productName, productPrice; - } - -} diff --git a/app/src/main/java/com/orangesale/cn/dataoperation/OrangeDatabase.java b/app/src/main/java/com/orangesale/cn/dataoperation/OrangeDatabase.java deleted file mode 100644 index 75992f3..0000000 --- a/app/src/main/java/com/orangesale/cn/dataoperation/OrangeDatabase.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.orangesale.cn.dataoperation; - -import android.content.ContentValues; -import android.content.Context; -import android.database.Cursor; -import android.database.sqlite.SQLiteDatabase; -import android.database.sqlite.SQLiteOpenHelper; -import android.os.Bundle; - -import androidx.annotation.Nullable; - -public class OrangeDatabase extends SQLiteOpenHelper { - public OrangeDatabase(@Nullable Context context) { - super(context, "orange", null, 1); - } - - @Override - public void onCreate(SQLiteDatabase db) { - //创建用户表 - String sql = "create table orange_user(id integer primary key autoincrement, username varchar(50), password varchar(50),sex varchar(10),city carchar(50))"; - db.execSQL(sql); - } - - @Override - public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { - - } - - /** - * 插入数据 - * - * @param sqLiteDatabase - * @param username - * @param password - * @param sex - * @param city - */ - public void insertUser(SQLiteDatabase sqLiteDatabase, String username, String password, String sex, String city) { - ContentValues contentValues = new ContentValues(); - contentValues.put("username", username); - contentValues.put("password", password); - contentValues.put("sex", sex); - contentValues.put("city", city); - sqLiteDatabase.insert("orange_user", null, contentValues); - sqLiteDatabase.close(); - } - - /** - * 查询数据 - * - * @param sqLiteDatabase - * @param bundle - * @return - */ - public Bundle queryUserInfo(SQLiteDatabase sqLiteDatabase, Bundle bundle) { - String username = bundle.getString("username"); - Cursor cursor = sqLiteDatabase.rawQuery("select * from orange_user where username=?", new String[]{username}); - if (cursor != null) { - while (cursor.moveToNext()) { - bundle.putString("sex", cursor.getString(3)); - bundle.putString("city", cursor.getString(4)); - } - } - cursor.close(); - sqLiteDatabase.close(); - return bundle; - } -} diff --git a/app/src/main/java/com/orangesale/cn/entity/Condition.java b/app/src/main/java/com/orangesale/cn/entity/Condition.java deleted file mode 100644 index de78bb9..0000000 --- a/app/src/main/java/com/orangesale/cn/entity/Condition.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.orangesale.cn.entity; - -public class Condition { - private Integer conditionIcon; - private String conditionName; - - public Integer getConditionIcon() { - return conditionIcon; - } - - public void setConditionIcon(Integer conditionIcon) { - this.conditionIcon = conditionIcon; - } - - public String getConditionName() { - return conditionName; - } - - public void setConditionName(String conditionName) { - this.conditionName = conditionName; - } - - @Override - public String toString() { - return "Condition{" + - "conditionIcon=" + conditionIcon + - ", conditionName='" + conditionName + '\'' + - '}'; - } -} diff --git a/app/src/main/java/com/orangesale/cn/entity/OrangeMessage.java b/app/src/main/java/com/orangesale/cn/entity/OrangeMessage.java deleted file mode 100644 index 48f63f5..0000000 --- a/app/src/main/java/com/orangesale/cn/entity/OrangeMessage.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.orangesale.cn.entity; - -import java.sql.Timestamp; - -public class OrangeMessage { - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getContent() { - return content; - } - - public void setContent(String content) { - this.content = content; - } - - public Timestamp getSendTime() { - return sendTime; - } - - public void setSendTime(Timestamp sendTime) { - this.sendTime = sendTime; - } - - public String getUsed() { - return used; - } - - public void setUsed(String used) { - this.used = used; - } - - private Integer id; - private String content; - private Timestamp sendTime; - private String used; - - @Override - public String toString() { - return "OrangeMessage{" + - "id=" + id + - ", content='" + content + '\'' + - ", sendTime=" + sendTime + - ", used='" + used + '\'' + - '}'; - } -} diff --git a/app/src/main/java/com/orangesale/cn/entity/OrangeProduct.java b/app/src/main/java/com/orangesale/cn/entity/OrangeProduct.java deleted file mode 100644 index 29bc9aa..0000000 --- a/app/src/main/java/com/orangesale/cn/entity/OrangeProduct.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.orangesale.cn.entity; - -import java.math.BigDecimal; -import java.sql.Timestamp; - -public class OrangeProduct { - private Integer id; - private String name; - private BigDecimal price; - private String imgUrl; - - @Override - public String toString() { - return "OrangeProduct{" + - "id=" + id + - ", name='" + name + '\'' + - ", price=" + price + - ", imgUrl='" + imgUrl + '\'' + - ", addTime=" + addTime + - '}'; - } - - public Timestamp getAddTime() { - return addTime; - } - - public void setAddTime(Timestamp addTime) { - this.addTime = addTime; - } - - private Timestamp addTime; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public BigDecimal getPrice() { - return price; - } - - public void setPrice(BigDecimal price) { - this.price = price; - } - - public String getImgUrl() { - return imgUrl; - } - - public void setImgUrl(String imgUrl) { - this.imgUrl = imgUrl; - } -} diff --git a/app/src/main/java/com/orangesale/cn/entity/OrangeProductPack.java b/app/src/main/java/com/orangesale/cn/entity/OrangeProductPack.java deleted file mode 100644 index 06f36c9..0000000 --- a/app/src/main/java/com/orangesale/cn/entity/OrangeProductPack.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.orangesale.cn.entity; - -import android.graphics.Bitmap; - -import java.math.BigDecimal; -import java.sql.Timestamp; - -public class OrangeProductPack { - private Integer id; - private String name; - private Timestamp addTime; - private Bitmap imgBitmap; - - public BigDecimal getPrice() { - return price; - } - - public void setPrice(BigDecimal price) { - this.price = price; - } - - private BigDecimal price; - - @Override - public String toString() { - return "OrangeProductPack{" + - "id=" + id + - ", name='" + name + '\'' + - ", addTime=" + addTime + - ", imgBitmap=" + imgBitmap + - ", price=" + price + - '}'; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Timestamp getAddTime() { - return addTime; - } - - public void setAddTime(Timestamp addTime) { - this.addTime = addTime; - } - - public Bitmap getImgBitmap() { - return imgBitmap; - } - - public void setImgBitmap(Bitmap imgBitmap) { - this.imgBitmap = imgBitmap; - } -} diff --git a/app/src/main/java/com/orangesale/cn/entity/OrangeUser.java b/app/src/main/java/com/orangesale/cn/entity/OrangeUser.java deleted file mode 100644 index bc3e24e..0000000 --- a/app/src/main/java/com/orangesale/cn/entity/OrangeUser.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.orangesale.cn.entity; - -public class OrangeUser { - private Integer id; - private String username; - private String password; - private String sex; - private String city; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getSex() { - return sex; - } - - public void setSex(String sex) { - this.sex = sex; - } - - public String getCity() { - return city; - } - - public void setCity(String city) { - this.city = city; - } - - @Override - public String toString() { - return "OrangeUser{" + - "username='" + username + '\'' + - ", password='" + password + '\'' + - ", sex='" + sex + '\'' + - ", city='" + city + '\'' + - '}'; - } -} diff --git a/app/src/main/java/com/orangesale/cn/entity/Product.java b/app/src/main/java/com/orangesale/cn/entity/Product.java deleted file mode 100644 index 2cab742..0000000 --- a/app/src/main/java/com/orangesale/cn/entity/Product.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.orangesale.cn.entity; - -import java.math.BigDecimal; - -public class Product { - - public String getProductName() { - return productName; - } - - public void setProductName(String productName) { - this.productName = productName; - } - - public BigDecimal getProductPrice() { - return productPrice; - } - - public void setProductPrice(BigDecimal productPrice) { - this.productPrice = productPrice; - } - - public Integer getImageUrlId() { - return imageUrlId; - } - - public void setImageUrlId(Integer imageUrlId) { - this.imageUrlId = imageUrlId; - } - - private Integer imageUrlId; - private String productName; - private BigDecimal productPrice; - - @Override - public String toString() { - return "Product{" + - "imageUrlId=" + imageUrlId + - ", productName='" + productName + '\'' + - ", productPrice=" + productPrice + - '}'; - } -} diff --git a/app/src/main/java/com/orangesale/cn/entity/ShoppingCart.java b/app/src/main/java/com/orangesale/cn/entity/ShoppingCart.java deleted file mode 100644 index b6600c8..0000000 --- a/app/src/main/java/com/orangesale/cn/entity/ShoppingCart.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.orangesale.cn.entity; - -public class ShoppingCart { - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Integer getUserId() { - return userId; - } - - public void setUserId(Integer userId) { - this.userId = userId; - } - - public Integer getProductId() { - return ProductId; - } - - public void setProductId(Integer productId) { - ProductId = productId; - } - - public Integer getNumber() { - return number; - } - - public void setNumber(Integer number) { - this.number = number; - } - - private Integer id; - private Integer userId; - private Integer ProductId; - /** - * 购买数量 - */ - private Integer number; -} diff --git a/app/src/main/java/com/orangesale/cn/fragment/IndexFragment.java b/app/src/main/java/com/orangesale/cn/fragment/IndexFragment.java deleted file mode 100644 index cb0a311..0000000 --- a/app/src/main/java/com/orangesale/cn/fragment/IndexFragment.java +++ /dev/null @@ -1,137 +0,0 @@ -package com.orangesale.cn.fragment; - -import android.app.Fragment; -import android.os.AsyncTask; -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.GridView; -import android.widget.LinearLayout; -import android.widget.SearchView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import com.orangesale.cn.R; -import com.orangesale.cn.adapter.ProductAdapter; -import com.orangesale.cn.entity.OrangeProductPack; -import com.orangesale.cn.entity.Product; -import com.orangesale.cn.netrequest.OkHttpClientProduct; - -import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; - - -public class IndexFragment extends Fragment implements View.OnClickListener { - private SearchView searchView; - private LinearLayout orangeLine, youziLine, juziLine, xiguaLine, liLine, appleLine, lemonLine, mangguoLine; - private GridView gridView; - private ProductAdapter productAdapter; - private List productList; - private List list = new ArrayList<>(); - - @Nullable - @Override - public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - View view = LayoutInflater.from(getActivity()).inflate(R.layout.content_index, container, false); - init(view); - return view; - } - - /** - * 初始化组件 - */ - private void init(View view) { - searchView = view.findViewById(R.id.searchView); - searchView.setOnClickListener(this); - orangeLine = view.findViewById(R.id.chengzi); - orangeLine.setOnClickListener(this); - youziLine = view.findViewById(R.id.youzi); - youziLine.setOnClickListener(this); - juziLine = view.findViewById(R.id.juzi); - juziLine.setOnClickListener(this); - xiguaLine = view.findViewById(R.id.xigua); - xiguaLine.setOnClickListener(this); - liLine = view.findViewById(R.id.li); - liLine.setOnClickListener(this); - lemonLine = view.findViewById(R.id.lemon); - lemonLine.setOnClickListener(this); - mangguoLine = view.findViewById(R.id.mangguo); - mangguoLine.setOnClickListener(this); - appleLine = view.findViewById(R.id.apple); - appleLine.setOnClickListener(this); - gridView = view.findViewById(R.id.index_famous_gridview); - //initData(); - new SearchProductTask().execute(); - } - - - @Override - public void onClick(View v) { - - } - - /** - * 初始化商品数据 - */ - private void initData() { - productList = new ArrayList<>(); - Product product = new Product(); - product.setImageUrlId(R.drawable.juzip); - product.setProductName("橘子"); - product.setProductPrice(new BigDecimal("9.9")); - Product product1 = new Product(); - product1.setImageUrlId(R.drawable.orange); - product1.setProductName("橙子"); - product1.setProductPrice(new BigDecimal("29.9")); - Product product2 = new Product(); - product2.setImageUrlId(R.drawable.youzip); - product2.setProductName("柚子"); - product2.setProductPrice(new BigDecimal("19.9")); - Product product3 = new Product(); - product3.setImageUrlId(R.drawable.xiguap); - product3.setProductName("西瓜"); - product3.setProductPrice(new BigDecimal("19.9")); - Product product4 = new Product(); - product4.setImageUrlId(R.drawable.applep); - product4.setProductName("苹果"); - product4.setProductPrice(new BigDecimal("49.9")); - Product product5 = new Product(); - product5.setImageUrlId(R.drawable.lemonp); - product5.setProductName("柠檬"); - product5.setProductPrice(new BigDecimal("9.9")); - productList.add(product); - productList.add(product1); - productList.add(product2); - productList.add(product3); - productList.add(product4); - productList.add(product5); - - } - - /** - * 发送网络请求获取数据 - */ - class SearchProductTask extends AsyncTask> { - - @Override - protected List doInBackground(Void... voids) { - OkHttpClientProduct clientProduct = new OkHttpClientProduct(); - try { - list = clientProduct.getProductPack(); - } catch (IOException e) { - e.printStackTrace(); - } - return list; - } - - @Override - protected void onPostExecute(List orangeProducts) { - productAdapter = new ProductAdapter(getActivity(), list); - gridView.setAdapter(productAdapter); - } - } -} diff --git a/app/src/main/java/com/orangesale/cn/fragment/PearsonFragment.java b/app/src/main/java/com/orangesale/cn/fragment/PearsonFragment.java deleted file mode 100644 index cc6f5ca..0000000 --- a/app/src/main/java/com/orangesale/cn/fragment/PearsonFragment.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.orangesale.cn.fragment; - -import android.app.Fragment; -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import com.orangesale.cn.R; - -public class PearsonFragment extends Fragment implements View.OnClickListener { - private ImageView userIconImage; - private TextView usernameText, userSexText, userCityText; - private LinearLayout usernameLine, userSexline, userCityLine, userPayLine, userSettingLine, userGeneralLine; - - - @Nullable - @Override - public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - View view = LayoutInflater.from(getActivity()).inflate(R.layout.content_user, container, false); - init(view); - return view; - } - - /** - * 组件初始化 - */ - private void init(View view) { - userIconImage = view.findViewById(R.id.user_icon); - usernameText = view.findViewById(R.id.user_username); - userSexText = view.findViewById(R.id.user_sex); - userCityText = view.findViewById(R.id.user_city); - usernameLine = view.findViewById(R.id.user_username_line); - userSexline = view.findViewById(R.id.user_sex_line); - userCityLine = view.findViewById(R.id.user_city_line); - userPayLine = view.findViewById(R.id.user_pay); - userSettingLine = view.findViewById(R.id.user_setting); - userGeneralLine = view.findViewById(R.id.user_general); - setData(); - } - - /** - * 组件赋值 - */ - private void setData() { - Bundle bundle = getArguments(); - usernameText.setText(String.format("用户名：%s", bundle.getString("username"))); - userSexText.setText(String.format("性别：%s", bundle.getString("sex"))); - userCityText.setText(String.format("城市：%s", bundle.getString("city"))); - } - - @Override - public void onClick(View v) { - - } - - -} diff --git a/app/src/main/java/com/orangesale/cn/fragment/ProductFragment.java b/app/src/main/java/com/orangesale/cn/fragment/ProductFragment.java deleted file mode 100644 index c63079e..0000000 --- a/app/src/main/java/com/orangesale/cn/fragment/ProductFragment.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.orangesale.cn.fragment; - -import android.app.Fragment; -import android.os.AsyncTask; -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.GridView; -import android.widget.Spinner; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import com.orangesale.cn.R; -import com.orangesale.cn.adapter.ListViewAdapter; -import com.orangesale.cn.adapter.ProductAdapter; -import com.orangesale.cn.entity.Condition; -import com.orangesale.cn.entity.OrangeProductPack; -import com.orangesale.cn.netrequest.OkHttpClientProduct; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -public class ProductFragment extends Fragment { - private Spinner conditonListSpinner; - private ListViewAdapter listViewAdapter; - private List conditionList; - private GridView productGridView; - private List orangeProductList = new ArrayList<>(); - - @Nullable - @Override - public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - View view = LayoutInflater.from(getActivity()).inflate(R.layout.content_product, container, false); - init(view); - return view; - } - - /** - * 组件初始化方法 - * - * @param view - */ - private void init(View view) { - conditonListSpinner = view.findViewById(R.id.product_select_condition); - initCondList(); - listViewAdapter = new ListViewAdapter(getActivity(), conditionList); - conditonListSpinner.setAdapter(listViewAdapter); - productGridView = view.findViewById(R.id.product_list); - new SearchProductTask().execute(); - } - - /** - * 初始化conditionList - */ - private void initCondList() { - conditionList = new ArrayList<>(); - Condition allCondition = new Condition(); - allCondition.setConditionIcon(R.drawable.all); - allCondition.setConditionName("全部"); - Condition saleCondition = new Condition(); - saleCondition.setConditionIcon(R.drawable.salenum); - saleCondition.setConditionName("按销量高低排序"); - Condition timeCondition = new Condition(); - timeCondition.setConditionIcon(R.drawable.time); - timeCondition.setConditionName("按上市时间排序"); - Condition priceCondition = new Condition(); - priceCondition.setConditionIcon(R.drawable.price); - priceCondition.setConditionName("按商品价格排序"); - conditionList.add(allCondition); - conditionList.add(saleCondition); - conditionList.add(timeCondition); - conditionList.add(priceCondition); - } - - /** - * 发送网络请求获取数据 - */ - class SearchProductTask extends AsyncTask> { - - @Override - protected List doInBackground(Void... voids) { - OkHttpClientProduct clientProduct = new OkHttpClientProduct(); - try { - orangeProductList = clientProduct.getProductPack(); - } catch (IOException e) { - e.printStackTrace(); - } - return orangeProductList; - } - - @Override - protected void onPostExecute(List orangeProducts) { - ProductAdapter productAdapter = new ProductAdapter(getActivity(), orangeProductList); - productGridView.setAdapter(productAdapter); - } - } - - -} diff --git a/app/src/main/java/com/orangesale/cn/fragment/SetDetailFragment.java b/app/src/main/java/com/orangesale/cn/fragment/SetDetailFragment.java deleted file mode 100644 index 14ad354..0000000 --- a/app/src/main/java/com/orangesale/cn/fragment/SetDetailFragment.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.orangesale.cn.fragment; - -import android.annotation.SuppressLint; -import android.app.Fragment; -import android.os.Bundle; -import android.util.Log; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import com.orangesale.cn.R; -import com.orangesale.cn.activity.CategoryActivity; - -import java.util.Objects; - -public class SetDetailFragment extends Fragment { - private View view; - private ImageView imageView; - private TextView nameText, priceText; - - @SuppressLint("SetTextI18n") - @Nullable - @Override - public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - view = inflater.inflate(R.layout.categoty_detail_content, container, false); - if (view != null) { - init(); - } - CategoryActivity categoryActivity = (CategoryActivity) getActivity(); - Objects.requireNonNull(categoryActivity).setOnChangeListener(product -> { - Log.i("sss", "onCreateView: " + product.getProductName()); - imageView.setBackgroundResource(product.getImageUrlId()); - nameText.setText(product.getProductName()); - priceText.setText(product.getProductPrice().toString()); - }); - return view; - } - - /** - * 内容组件初始化 - */ - private void init() { - imageView = view.findViewById(R.id.category_product_image); - nameText = view.findViewById(R.id.category_product_name); - priceText = view.findViewById(R.id.category_product_price); - } - -} diff --git a/app/src/main/java/com/orangesale/cn/fragment/ShoppingCartFragment.java b/app/src/main/java/com/orangesale/cn/fragment/ShoppingCartFragment.java deleted file mode 100644 index 680bbe3..0000000 --- a/app/src/main/java/com/orangesale/cn/fragment/ShoppingCartFragment.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.orangesale.cn.fragment; - -import android.app.Fragment; -import android.app.FragmentTransaction; -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.Button; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import com.orangesale.cn.R; -import com.orangesale.cn.entity.ShoppingCart; - -import java.util.ArrayList; -import java.util.List; - -public class ShoppingCartFragment extends Fragment implements View.OnClickListener { - private Button walkButton; - private List cartList = new ArrayList<>(); - private ProductFragment productFragment; - - @Nullable - @Override - public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - View view; - if (cartList.size() > 0) { - //有商品 - view = LayoutInflater.from(getActivity()).inflate(R.layout.cart_have_product, container, false); - } else { - view = LayoutInflater.from(getActivity()).inflate(R.layout.cart_no_product, container, false); - } - init(view); - return view; - } - - /** - * 组件初始化 - */ - private void init(View view) { - walkButton = view.findViewById(R.id.random_search); - walkButton.setOnClickListener(this); - } - - @Override - public void onClick(View v) { - switch (v.getId()) { - case R.id.random_search: - //开启事务，fragment的控制是由事务来实现的 - FragmentTransaction transaction = getFragmentManager().beginTransaction(); - if (productFragment == null) { - productFragment = new ProductFragment(); - } - transaction.replace(R.id.main_content, productFragment); - transaction.commit(); - break; - } - } -} diff --git a/app/src/main/java/com/orangesale/cn/netrequest/OkHttpClientProduct.java b/app/src/main/java/com/orangesale/cn/netrequest/OkHttpClientProduct.java deleted file mode 100644 index f1f5082..0000000 --- a/app/src/main/java/com/orangesale/cn/netrequest/OkHttpClientProduct.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.orangesale.cn.netrequest; - -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.TypeReference; -import com.orangesale.cn.entity.OrangeProduct; -import com.orangesale.cn.entity.OrangeProductPack; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; - -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; - -public class OkHttpClientProduct { - - /** - * 查询商品信息 - * - * @return - */ - public List getProduct() throws IOException { - OkHttpClient okHttpClient = new OkHttpClient(); - Request request = new Request.Builder() - .url("http://172.16.40.55:8081/orange/product/search") - .build(); - Response response = okHttpClient.newCall(request).execute(); - JSONObject jsonObject = JSON.parseObject(Objects.requireNonNull(response.body()).string()); - List list = JSON.parseObject(jsonObject.getString("data"), new TypeReference>() { - }); - return list; - } - - /** - * 获取图片 - * - * @param imgUrl - * @return - * @throws IOException - */ - public Bitmap getImageBitMap(String imgUrl) throws IOException { - Bitmap bitmap; - OkHttpClient okHttpClient = new OkHttpClient(); - Request request = new Request.Builder() - .url(imgUrl) - .build(); - Response response = okHttpClient.newCall(request).execute(); - byte[] bytes = Objects.requireNonNull(response.body()).bytes(); - bitmap = BitmapFactory.decodeByteArray(bytes, 0, bytes.length); - return bitmap; - - } - - /** - * 封装信息 - * - * @return - * @throws IOException - */ - - public List getProductPack() throws IOException { - List packList = new ArrayList<>(); - List list = getProduct(); - for (OrangeProduct orangeProduct : list) { - OrangeProductPack orangeProductPack = new OrangeProductPack(); - orangeProductPack.setId(orangeProduct.getId()); - orangeProductPack.setImgBitmap(getImageBitMap(orangeProduct.getImgUrl())); - orangeProductPack.setAddTime(orangeProduct.getAddTime()); - orangeProductPack.setPrice(orangeProduct.getPrice()); - packList.add(orangeProductPack); - } - return packList; - } -} diff --git a/app/src/main/java/com/orangesale/cn/netrequest/OkHttpMessage.java b/app/src/main/java/com/orangesale/cn/netrequest/OkHttpMessage.java deleted file mode 100644 index d61f9a2..0000000 --- a/app/src/main/java/com/orangesale/cn/netrequest/OkHttpMessage.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.orangesale.cn.netrequest; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.orangesale.cn.entity.OrangeMessage; - -import java.io.IOException; -import java.util.Objects; - -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; - -public class OkHttpMessage { - - /** - * 消费消息 - * - * @return - */ - public OrangeMessage consumeMessage() throws IOException { - OkHttpClient okHttpClient = new OkHttpClient(); - Request request = new Request.Builder() - .url("http://172.16.40.55:8081/orange/message/consumeMessage") - .build(); - Response response = okHttpClient.newCall(request).execute(); - JSONObject jsonObject = JSON.parseObject(Objects.requireNonNull(response.body()).string()); - OrangeMessage orangeMessage = JSON.toJavaObject(jsonObject.getJSONObject("data"), OrangeMessage.class); - /** - * 消费完消息以后，设置消息为已读 - */ - Request request1 = new Request.Builder() - .url("http://172.16.40.55:8081/orange/message/updateMessage") - .build(); - okHttpClient.newCall(request1).execute(); - return orangeMessage; - } - -} diff --git a/app/src/main/java/com/orangesale/cn/netrequest/OkHttpUser.java b/app/src/main/java/com/orangesale/cn/netrequest/OkHttpUser.java deleted file mode 100644 index 0fb067b..0000000 --- a/app/src/main/java/com/orangesale/cn/netrequest/OkHttpUser.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.orangesale.cn.netrequest; - -import android.util.Log; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.orangesale.cn.entity.OrangeUser; - -import java.io.IOException; - -import okhttp3.MediaType; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.RequestBody; -import okhttp3.Response; - -public class OkHttpUser { - - /** - * 用户登录验证 - * - * @param orangeUser - */ - public OrangeUser userLogin(OrangeUser orangeUser) throws IOException { - OkHttpClient okHttpClient = new OkHttpClient(); - //数据类型为json格式 - MediaType mediaType = MediaType.parse("application/json; charset=utf-8"); - //将对象转为JSON字符串 - String jsonStr = JSONObject.toJSONString(orangeUser); - RequestBody requestBody = RequestBody.create(jsonStr, mediaType); - Request request = new Request.Builder() - .url("http://172.16.40.55:8081/orange/user/login") - .post(requestBody) - .build(); - Response response = okHttpClient.newCall(request).execute(); - JSONObject jsonObject = JSON.parseObject(response.body().string()); - JSONObject jsonObject1 = jsonObject.getJSONObject("data"); - OrangeUser orangeUser1 = JSON.toJavaObject(jsonObject1, OrangeUser.class); - return orangeUser1; - } - - /** - * 用户注册 - * - * @param orangeUser - * @return - * @throws IOException - */ - public boolean userRegister(OrangeUser orangeUser) throws IOException { - OkHttpClient okHttpClient = new OkHttpClient(); - //数据类型为json格式 - MediaType mediaType = MediaType.parse("application/json; charset=utf-8"); - //将对象转为JSON字符串 - String jsonStr = JSONObject.toJSONString(orangeUser); - RequestBody requestBody = RequestBody.create(jsonStr, mediaType); - Request request = new Request.Builder() - .url("http://172.16.40.55:8081/orange/user/register") - .post(requestBody) - .build(); - Response response = okHttpClient.newCall(request).execute(); - JSONObject jsonObject = JSON.parseObject(response.body().string()); - Log.i("register", "userRegister: "+jsonObject); - return jsonObject.getBoolean("flag"); - } - - -} diff --git a/app/src/main/java/com/orangesale/cn/service/TimeService.java b/app/src/main/java/com/orangesale/cn/service/TimeService.java deleted file mode 100644 index cac57df..0000000 --- a/app/src/main/java/com/orangesale/cn/service/TimeService.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.orangesale.cn.service; - -import android.app.Notification; -import android.app.NotificationChannel; -import android.app.NotificationManager; -import android.app.Service; -import android.content.Context; -import android.content.Intent; -import android.os.AsyncTask; -import android.os.IBinder; -import android.util.Log; - -import androidx.annotation.Nullable; -import androidx.core.app.NotificationCompat; - -import com.orangesale.cn.R; -import com.orangesale.cn.entity.OrangeMessage; -import com.orangesale.cn.netrequest.OkHttpMessage; - -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Objects; -import java.util.Timer; -import java.util.TimerTask; - -public class TimeService extends Service { - private static Timer timer = null; - private NotificationManager manager; - private NotificationCompat.Builder builder; - - @Nullable - @Override - public IBinder onBind(Intent intent) { - return null; - } - - /** - * 清除通知 - */ - private void cleanAllNotification() { - manager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); - manager.cancelAll(); - if (timer != null) { - timer.cancel(); - timer = null; - } - - } - - /** - * 添加通知 - */ - @Override - public int onStartCommand(Intent intent, int flags, int startId) { - long period = 60 * 1000; //1分钟一个周期 - if (timer == null) { - timer = new Timer(); - } - timer.schedule(new TimerTask() { - @Override - public void run() { - new ConsumeMessageTask().execute(); - } - }, 0, period); - - return super.onStartCommand(intent, flags, startId); - } - - class ConsumeMessageTask extends AsyncTask { - @Override - protected Void doInBackground(Void... voids) { - /** - * NotificationChannel是android8.0新增的特性，如果App的targetSDKVersion>=26， - * 没有设置channel通知渠道的话，就会导致通知无法展示。 - * 报错内容：Failed to post notification on channel “null” - */ - OkHttpMessage okHttpMessage = new OkHttpMessage(); - OrangeMessage orangeMessage; - try { - orangeMessage = okHttpMessage.consumeMessage(); - if (!Objects.isNull(orangeMessage)) { - Log.i("orangeMessage", "run: " + orangeMessage.toString()); - NotificationChannel channel = new NotificationChannel("channel", "通知", NotificationManager.IMPORTANCE_DEFAULT); - manager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); - manager.createNotificationChannel(channel); - builder = new NotificationCompat.Builder(TimeService.this); - Date date = new Date(); - SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - builder.setContentTitle("来自橙一色的系统通知消息" + " " + formatter.format(date)); - builder.setSmallIcon(R.drawable.chengzi); - builder.setChannelId("channel"); - builder.setContentText(orangeMessage.getContent()); - builder.setAutoCancel(true); - builder.setDefaults(Notification.DEFAULT_ALL); - Notification notification = builder.build(); - manager.notify(1, notification); - } - } catch (IOException e) { - e.printStackTrace(); - } - return null; - } - } -} diff --git a/app/src/main/res/drawable/address.png b/app/src/main/res/drawable/address.png deleted file mode 100644 index 7318be0..0000000 Binary files a/app/src/main/res/drawable/address.png and /dev/null differ diff --git a/app/src/main/res/drawable/all.png b/app/src/main/res/drawable/all.png deleted file mode 100644 index 131c4fd..0000000 Binary files a/app/src/main/res/drawable/all.png and /dev/null differ diff --git a/app/src/main/res/drawable/apple.png b/app/src/main/res/drawable/apple.png deleted file mode 100644 index 0810381..0000000 Binary files a/app/src/main/res/drawable/apple.png and /dev/null differ diff --git a/app/src/main/res/drawable/applep.png b/app/src/main/res/drawable/applep.png deleted file mode 100644 index e26da47..0000000 Binary files a/app/src/main/res/drawable/applep.png and /dev/null differ diff --git a/app/src/main/res/drawable/arrow_down.png b/app/src/main/res/drawable/arrow_down.png deleted file mode 100644 index 6d95bb5..0000000 Binary files a/app/src/main/res/drawable/arrow_down.png and /dev/null differ diff --git a/app/src/main/res/drawable/arrow_left.png b/app/src/main/res/drawable/arrow_left.png deleted file mode 100644 index 365afe0..0000000 Binary files a/app/src/main/res/drawable/arrow_left.png and /dev/null differ diff --git a/app/src/main/res/drawable/arrow_right.png b/app/src/main/res/drawable/arrow_right.png deleted file mode 100644 index 84ded85..0000000 Binary files a/app/src/main/res/drawable/arrow_right.png and /dev/null differ diff --git a/app/src/main/res/drawable/button_login.xml b/app/src/main/res/drawable/button_login.xml deleted file mode 100644 index d093f1b..0000000 --- a/app/src/main/res/drawable/button_login.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/button_register.xml b/app/src/main/res/drawable/button_register.xml deleted file mode 100644 index 3eb0673..0000000 --- a/app/src/main/res/drawable/button_register.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/cart.png b/app/src/main/res/drawable/cart.png deleted file mode 100644 index f2e1190..0000000 Binary files a/app/src/main/res/drawable/cart.png and /dev/null differ diff --git a/app/src/main/res/drawable/chengzi.png b/app/src/main/res/drawable/chengzi.png deleted file mode 100644 index fff0306..0000000 Binary files a/app/src/main/res/drawable/chengzi.png and /dev/null differ diff --git a/app/src/main/res/drawable/city.png b/app/src/main/res/drawable/city.png deleted file mode 100644 index 790fb2b..0000000 Binary files a/app/src/main/res/drawable/city.png and /dev/null differ diff --git a/app/src/main/res/drawable/index.png b/app/src/main/res/drawable/index.png deleted file mode 100644 index cc1ec04..0000000 Binary files a/app/src/main/res/drawable/index.png and /dev/null differ diff --git a/app/src/main/res/drawable/index_menu.xml b/app/src/main/res/drawable/index_menu.xml deleted file mode 100644 index 14636dd..0000000 --- a/app/src/main/res/drawable/index_menu.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/juzi.png b/app/src/main/res/drawable/juzi.png deleted file mode 100644 index 106df92..0000000 Binary files a/app/src/main/res/drawable/juzi.png and /dev/null differ diff --git a/app/src/main/res/drawable/juzip.png b/app/src/main/res/drawable/juzip.png deleted file mode 100644 index 4f10b72..0000000 Binary files a/app/src/main/res/drawable/juzip.png and /dev/null differ diff --git a/app/src/main/res/drawable/lemon.png b/app/src/main/res/drawable/lemon.png deleted file mode 100644 index 39f12cc..0000000 Binary files a/app/src/main/res/drawable/lemon.png and /dev/null differ diff --git a/app/src/main/res/drawable/lemonp.png b/app/src/main/res/drawable/lemonp.png deleted file mode 100644 index ca5eca8..0000000 Binary files a/app/src/main/res/drawable/lemonp.png and /dev/null differ diff --git a/app/src/main/res/drawable/li.png b/app/src/main/res/drawable/li.png deleted file mode 100644 index 0834592..0000000 Binary files a/app/src/main/res/drawable/li.png and /dev/null differ diff --git a/app/src/main/res/drawable/mangguo.png b/app/src/main/res/drawable/mangguo.png deleted file mode 100644 index 2e9825c..0000000 Binary files a/app/src/main/res/drawable/mangguo.png and /dev/null differ diff --git a/app/src/main/res/drawable/orange.png b/app/src/main/res/drawable/orange.png deleted file mode 100644 index 70e8db8..0000000 Binary files a/app/src/main/res/drawable/orange.png and /dev/null differ diff --git a/app/src/main/res/drawable/password.png b/app/src/main/res/drawable/password.png deleted file mode 100644 index 1c6c4f5..0000000 Binary files a/app/src/main/res/drawable/password.png and /dev/null differ diff --git a/app/src/main/res/drawable/pearson.png b/app/src/main/res/drawable/pearson.png deleted file mode 100644 index 90cf0eb..0000000 Binary files a/app/src/main/res/drawable/pearson.png and /dev/null differ diff --git a/app/src/main/res/drawable/price.png b/app/src/main/res/drawable/price.png deleted file mode 100644 index c7a125c..0000000 Binary files a/app/src/main/res/drawable/price.png and /dev/null differ diff --git a/app/src/main/res/drawable/product.png b/app/src/main/res/drawable/product.png deleted file mode 100644 index 8f5cb21..0000000 Binary files a/app/src/main/res/drawable/product.png and /dev/null differ diff --git a/app/src/main/res/drawable/salenum.png b/app/src/main/res/drawable/salenum.png deleted file mode 100644 index 87ed2c9..0000000 Binary files a/app/src/main/res/drawable/salenum.png and /dev/null differ diff --git a/app/src/main/res/drawable/search.png b/app/src/main/res/drawable/search.png deleted file mode 100644 index a8b5ac0..0000000 Binary files a/app/src/main/res/drawable/search.png and /dev/null differ diff --git a/app/src/main/res/drawable/setting.png b/app/src/main/res/drawable/setting.png deleted file mode 100644 index 34c2f2f..0000000 Binary files a/app/src/main/res/drawable/setting.png and /dev/null differ diff --git a/app/src/main/res/drawable/sex.png b/app/src/main/res/drawable/sex.png deleted file mode 100644 index acb8197..0000000 Binary files a/app/src/main/res/drawable/sex.png and /dev/null differ diff --git a/app/src/main/res/drawable/shoppingcart.png b/app/src/main/res/drawable/shoppingcart.png deleted file mode 100644 index 76c06de..0000000 Binary files a/app/src/main/res/drawable/shoppingcart.png and /dev/null differ diff --git a/app/src/main/res/drawable/shuiguo.png b/app/src/main/res/drawable/shuiguo.png deleted file mode 100644 index d316137..0000000 Binary files a/app/src/main/res/drawable/shuiguo.png and /dev/null differ diff --git a/app/src/main/res/drawable/spinner_drop_down_shape.xml b/app/src/main/res/drawable/spinner_drop_down_shape.xml deleted file mode 100644 index 64306b1..0000000 --- a/app/src/main/res/drawable/spinner_drop_down_shape.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/sure_apssword.png b/app/src/main/res/drawable/sure_apssword.png deleted file mode 100644 index 0e7cee9..0000000 Binary files a/app/src/main/res/drawable/sure_apssword.png and /dev/null differ diff --git a/app/src/main/res/drawable/tab_menu_text.xml b/app/src/main/res/drawable/tab_menu_text.xml deleted file mode 100644 index fb06945..0000000 --- a/app/src/main/res/drawable/tab_menu_text.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/time.png b/app/src/main/res/drawable/time.png deleted file mode 100644 index 8a672eb..0000000 Binary files a/app/src/main/res/drawable/time.png and /dev/null differ diff --git a/app/src/main/res/drawable/user.png b/app/src/main/res/drawable/user.png deleted file mode 100644 index 47d8362..0000000 Binary files a/app/src/main/res/drawable/user.png and /dev/null differ diff --git a/app/src/main/res/drawable/user_account.png b/app/src/main/res/drawable/user_account.png deleted file mode 100644 index e70142a..0000000 Binary files a/app/src/main/res/drawable/user_account.png and /dev/null differ diff --git a/app/src/main/res/drawable/user_general.png b/app/src/main/res/drawable/user_general.png deleted file mode 100644 index cf57947..0000000 Binary files a/app/src/main/res/drawable/user_general.png and /dev/null differ diff --git a/app/src/main/res/drawable/user_icon.png b/app/src/main/res/drawable/user_icon.png deleted file mode 100644 index d5309b1..0000000 Binary files a/app/src/main/res/drawable/user_icon.png and /dev/null differ diff --git a/app/src/main/res/drawable/user_pay.png b/app/src/main/res/drawable/user_pay.png deleted file mode 100644 index 3fd6f50..0000000 Binary files a/app/src/main/res/drawable/user_pay.png and /dev/null differ diff --git a/app/src/main/res/drawable/user_sex.png b/app/src/main/res/drawable/user_sex.png deleted file mode 100644 index da0e318..0000000 Binary files a/app/src/main/res/drawable/user_sex.png and /dev/null differ diff --git a/app/src/main/res/drawable/xigua.png b/app/src/main/res/drawable/xigua.png deleted file mode 100644 index 20275c1..0000000 Binary files a/app/src/main/res/drawable/xigua.png and /dev/null differ diff --git a/app/src/main/res/drawable/xiguap.png b/app/src/main/res/drawable/xiguap.png deleted file mode 100644 index b760712..0000000 Binary files a/app/src/main/res/drawable/xiguap.png and /dev/null differ diff --git a/app/src/main/res/drawable/youzi.png b/app/src/main/res/drawable/youzi.png deleted file mode 100644 index 53df959..0000000 Binary files a/app/src/main/res/drawable/youzi.png and /dev/null differ diff --git a/app/src/main/res/drawable/youzip.png b/app/src/main/res/drawable/youzip.png deleted file mode 100644 index 5a7d966..0000000 Binary files a/app/src/main/res/drawable/youzip.png and /dev/null differ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index dfe67c8..89b42a1 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,29 +1,19 @@ - + tools:context=".MainActivity"> - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/cart_have_product.xml b/app/src/main/res/layout/cart_have_product.xml deleted file mode 100644 index b7362e4..0000000 --- a/app/src/main/res/layout/cart_have_product.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/cart_no_product.xml b/app/src/main/res/layout/cart_no_product.xml deleted file mode 100644 index ff8c14c..0000000 --- a/app/src/main/res/layout/cart_no_product.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - -