Merge pull request '功能添加' (#4) from Huatao_branch into master

src/Logistics/.idea/deploymentTargetDropDown.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <targetSelectedWithDropDown>
+      <Target>
+        <type value="QUICK_BOOT_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="VIRTUAL_DEVICE_PATH" />
+            <value value="E:\SDK\avd\.android\avd\Pixel_XL_API_30.avd" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </targetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2022-04-05T13:12:36.745229500Z" />
+  </component>
+</project>

src/Logistics/.idea/misc.xml

@@ -9,6 +9,20 @@
         <entry key="..\:/Logistics/app/src/main/res/layout/activity_main.xml" value="0.10126582278481013" />
         <entry key="..\:/Logistics/app/src/main/res/layout/activity_sign_up.xml" value="0.1" />
         <entry key="..\:/Logistics/app/src/main/res/layout/buttom.xml" value="0.15" />
+        <entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/drawable/tab_menu_better.xml" value="0.1135" />
+        <entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/drawable/tab_menu_text.xml" value="0.1" />
+        <entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/drawable/translucent_edit.xml" value="0.1135" />
+        <entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/layout/activity_main.xml" value="0.10235507246376811" />
+        <entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/layout/activity_main2.xml" value="0.10235507246376811" />
+        <entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/layout/activity_menu.xml" value="0.33" />
+        <entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/layout/activity_sign_up.xml" value="0.10235507246376811" />
+        <entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/layout/buttom.xml" value="0.10235507246376811" />
+        <entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/layout/fragment_my.xml" value="0.10235507246376811" />
+        <entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/layout/my_fragment1.xml" value="0.18489583333333334" />
+        <entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/layout/my_fragment2.xml" value="0.18489583333333334" />
+        <entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/layout/my_fragment3.xml" value="0.18489583333333334" />
+        <entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/layout/tab1.xml" value="0.10235507246376811" />
+        <entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/layout/top.xml" value="0.3717105263157895" />
       </map>
     </option>
   </component>

src/Logistics/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
+  </component>
+</project>

src/Logistics/app/src/main/AndroidManifest.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.logistics" >
+
     <uses-permission android:name="android.permission.INTERNET" />
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
@@ -9,6 +11,9 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Logistics" >
+        <activity
+            android:name=".ui.MenuActivity"
+            android:exported="false" />
         <activity
             android:name=".ui.MainActivity"
             android:exported="true" >

src/Logistics/app/src/main/java/com/example/logistics/ui/Fragment3.java

@@ -0,0 +1,4 @@
+package com.example.logistics.ui;
+
+public class Fragment3 {
+}

src/Logistics/app/src/main/java/com/example/logistics/ui/MainActivity.java

@@ -23,7 +23,8 @@ public class MainActivity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-
+        Intent intent = new Intent(MainActivity.this, MenuActivity.class);
+        startActivity(intent);
         Button loginButton = (Button) this.findViewById(R.id.LoginButton);
         Button signUpButton = (Button) this.findViewById(R.id.SignUpButton);
 
@@ -58,6 +59,10 @@ public class MainActivity extends Activity {
                 int msg = userDao.login(userName.getText().toString().trim(), passWord.getText().toString().trim());
                 Log.e("MAin", "msg");
                 hand1.sendEmptyMessage(msg);
+                if(msg == 1){
+                    Intent intent = new Intent(MainActivity.this, MenuActivity.class);
+                    startActivity(intent);
+                }
             }
         }.start();
     }

src/Logistics/app/src/main/java/com/example/logistics/ui/MenuActivity.java

@@ -0,0 +1,82 @@
+package com.example.logistics.ui;
+
+import android.app.FragmentTransaction;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.example.logistics.R;
+
+public class MenuActivity extends AppCompatActivity implements View.OnClickListener{
+    private LinearLayout ly_one,ly_two,ly_three;
+    private TextView mTextView1,mTextView2,mTextView3;
+    private TextView mTextNum1,mTextNum2,mTextNum3;
+    private ImageView mImageView;
+
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_menu);
+
+        bindView();
+        ly_one.performClick();
+        FragmentTransaction transaction = getFragmentManager().beginTransaction();
+        MyFragment1 fg1 = new MyFragment1();
+        transaction.add(R.id.fragment_container,fg1);
+        transaction.commit();
+    }
+
+    private void bindView() {
+
+        ly_one = (LinearLayout)findViewById(R.id.ly_tab_menu_deal);
+        ly_two = (LinearLayout)findViewById(R.id.ly_tab_menu_poi);
+        ly_three = (LinearLayout)findViewById(R.id.ly_tab_menu_more);
+
+        mTextView1 = (TextView)findViewById(R.id.tab_menu_deal);
+        mTextView2 = (TextView)findViewById(R.id.tab_menu_poi);
+        mTextView3 = (TextView)findViewById(R.id.tab_menu_more);
+
+        mTextNum1 = (TextView)findViewById(R.id.tab_menu_deal_num);
+        mTextNum2 = (TextView)findViewById(R.id.tab_menu_poi_num);
+        mTextNum3 = (TextView)findViewById(R.id.tab_menu_more_num);
+
+
+        ly_one.setOnClickListener(this);
+        ly_two.setOnClickListener(this);
+        ly_three.setOnClickListener(this);
+    }
+
+    //重置所有文本的选中状态
+    private void setSelected() {
+        mTextView1.setSelected(false);
+        mTextView2.setSelected(false);
+        mTextView3.setSelected(false);
+    }
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.ly_tab_menu_deal:
+                setSelected();
+                mTextView1.setSelected(true);
+                mTextNum1.setVisibility(View.INVISIBLE);
+                break;
+            case R.id.ly_tab_menu_poi:
+                setSelected();
+                mTextView2.setSelected(true);
+                mTextNum2.setVisibility(View.INVISIBLE);
+                break;
+            case R.id.ly_tab_menu_more:
+                setSelected();
+                mTextView3.setSelected(true);
+                mTextNum3.setVisibility(View.INVISIBLE);
+                break;
+        }
+    }
+
+}

src/Logistics/app/src/main/java/com/example/logistics/ui/MyFragment1.java

@@ -0,0 +1,62 @@
+package com.example.logistics.ui;
+
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import android.app.Fragment;
+
+import com.example.logistics.R;
+
+public class MyFragment1 extends Fragment implements View.OnClickListener{
+    private Context mContext;
+    private Button btn_one;
+    private Button btn_two;
+    private Button btn_three;
+    private Button btn_four;
+
+    public MyFragment1(){
+
+    }
+    @Nullable
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.my_fragment1,container,false);
+        btn_one = (Button)view.findViewById(R.id.btn_one);
+        btn_two = (Button)view.findViewById(R.id.btn_two);
+        btn_three = (Button)view.findViewById(R.id.btn_three);
+
+        btn_one.setOnClickListener(this);
+        btn_two.setOnClickListener(this);
+        btn_three.setOnClickListener(this);
+        return view;
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch(v.getId()){
+            case R.id.btn_one:
+                TextView mTextViewDeal = (TextView)getActivity().findViewById(R.id.tab_menu_deal_num);
+                mTextViewDeal.setText("11");
+                mTextViewDeal.setVisibility(View.VISIBLE);
+                break;
+            case R.id.btn_two:
+                TextView mTextViewPoi = (TextView)getActivity().findViewById(R.id.tab_menu_poi_num);
+                mTextViewPoi.setText("99");
+                mTextViewPoi.setVisibility(View.VISIBLE);
+                break;
+            case R.id.btn_three:
+                TextView mTextViewMore = (TextView)getActivity().findViewById(R.id.tab_menu_more_num);
+                mTextViewMore.setText("999+");
+                mTextViewMore.setVisibility(View.VISIBLE);
+                break;
+        }
+    }
+}

src/Logistics/app/src/main/java/com/example/logistics/ui/MyFragment2.java

@@ -0,0 +1,4 @@
+package com.example.logistics.ui;
+
+public class MyFragment2 {
+}

src/Logistics/app/src/main/res/drawable/tab_menu_better.xml

@@ -0,0 +1,6 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/me" android:state_selected="true"/>
+    <item android:drawable="@drawable/me"/>
+
+</selector>

src/Logistics/app/src/main/res/drawable/tab_menu_text.xml

@@ -0,0 +1,6 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:color="@color/blue" android:state_selected="true"/>
+    <item android:color="@color/gray" />
+
+</selector>

src/Logistics/app/src/main/res/layout/activity_main.xml

@@ -4,7 +4,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.example.logistics.ui.MainActivity">
-
     <!--使用线性布局-->
     <LinearLayout
         android:id="@+id/linearLayout2"
@@ -112,11 +111,6 @@
             </LinearLayout>
 
         </LinearLayout>
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" >
-        <include layout="@layout/buttom"></include>
-        </LinearLayout>
     </LinearLayout>
 
 

src/Logistics/app/src/main/res/layout/activity_menu.xml

@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <RelativeLayout
+        android:id="@+id/ly_top_bar"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:background="@color/white">
+
+        <TextView
+            android:id="@+id/txt_topbar"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_centerInParent="true"
+            android:gravity="center"
+            android:text="顶端"
+            android:textColor="@color/gray"
+            android:textSize="18sp" />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="2px"
+            android:layout_alignParentBottom="true"
+            android:background="@color/gray" />
+
+    </RelativeLayout>
+    <LinearLayout
+        android:id="@+id/ly_tab_menu"
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:layout_alignParentBottom="true"
+        android:background="@color/white"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:id="@+id/ly_tab_menu_deal"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center">
+
+            <RelativeLayout
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:padding="5dp">
+
+                <TextView
+                    android:id="@+id/tab_menu_deal"
+                    style="@style/tab_menu_text"
+                    android:drawableTop="@drawable/search"
+                    android:text="查件" />
+
+                <TextView
+                    android:id="@+id/tab_menu_deal_num"
+                    style="@style/tab_menu_bgnum"
+                    android:layout_toRightOf="@+id/tab_menu_deal"
+                    android:text="99+"
+                    android:visibility="gone" />
+            </RelativeLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/ly_tab_menu_poi"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center">
+
+            <RelativeLayout
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:padding="5dp">
+
+                <TextView
+                    android:id="@+id/tab_menu_poi"
+                    style="@style/tab_menu_text"
+                    android:drawableTop="@drawable/pickup"
+                    android:text="取件" />
+
+                <TextView
+                    android:id="@+id/tab_menu_poi_num"
+                    style="@style/tab_menu_bgnum"
+                    android:layout_toRightOf="@+id/tab_menu_poi"
+                    android:text="99+"
+                    android:visibility="gone" />
+            </RelativeLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/ly_tab_menu_more"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center">
+
+            <RelativeLayout
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:padding="5dp">
+
+                <TextView
+                    android:id="@+id/tab_menu_more"
+                    style="@style/tab_menu_text"
+                    android:drawableTop="@drawable/me"
+                    android:text="我的" />
+
+                <TextView
+                    android:id="@+id/tab_menu_more_num"
+                    style="@style/tab_menu_bgnum"
+                    android:layout_toRightOf="@+id/tab_menu_more"
+                    android:text="99+"
+                    android:visibility="gone" />
+            </RelativeLayout>
+        </LinearLayout>
+
+
+
+    </LinearLayout>
+
+    <View
+        android:id="@+id/div_tab_bar"
+        android:layout_width="match_parent"
+        android:layout_height="2px"
+        android:layout_above="@id/ly_tab_menu"
+        android:background="@color/gray" />
+
+    <FrameLayout
+        android:id="@+id/fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/div_tab_bar"
+        android:layout_below="@id/ly_top_bar"
+        android:background="@color/white" />
+
+</RelativeLayout>

src/Logistics/app/src/main/res/layout/buttom.xml

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="60dp"
-    android:gravity="center"
-    android:layout_alignParentBottom="true">
-
-    <LinearLayout
-        android:id="@+id/search_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:gravity="center"
-        android:orientation="vertical">
-
-        <ImageButton
-            android:id="@+id/search"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            app:srcCompat="@drawable/me" />
-
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/pick_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:gravity="center"
-        android:orientation="vertical">
-
-        <ImageView
-            android:id="@+id/pick"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            app:srcCompat="@drawable/me" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/me_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:gravity="center"
-        android:orientation="vertical">
-
-        <ImageView
-            android:id="@+id/me"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            app:srcCompat="@drawable/me" />
-
-
-    </LinearLayout>
-
-</LinearLayout>
-

src/Logistics/app/src/main/res/layout/my_fragment1.xml

@@ -0,0 +1,28 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="5dp">
+    <Button
+        android:id="@+id/btn_one"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="显示第一个消息"/>
+
+    <Button
+        android:id="@+id/btn_two"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="第二个显示信息"/>
+
+    <Button
+        android:id="@+id/btn_three"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="第三个显示信息"/>
+
+
+</LinearLayout>

src/Logistics/app/src/main/res/layout/my_fragment2.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:text="frag2"/>
+</LinearLayout>

src/Logistics/app/src/main/res/layout/my_fragment3.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:text="frag2"/>
+</LinearLayout>

src/Logistics/app/src/main/res/values/colors.xml

@@ -7,4 +7,6 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+    <color name="blue">#FF0000FF</color>
+    <color name="gray">#FF999999</color>
 </resources>

src/Logistics/app/src/main/res/values/style.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="tab_menu_text">
+        <item name="android:layout_marginTop">5dp</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">48dp</item>
+        <item name="android:layout_centerInParent">true</item>
+        <item name="android:textColor">@drawable/tab_menu_text</item>
+    </style>
+
+
+    <style name="tab_menu_bgnum">
+        <item name="android:layout_width">20dp</item>
+        <item name="android:layout_height">20dp</item>
+        <item name="android:background">@drawable/me</item>
+        <item name="android:layout_marginLeft">-10dp</item>
+        <item name="android:textSize">12sp</item>
+        <item name="android:gravity">center</item>
+        <item name="android:textColor">@color/blue</item>
+    </style>
+</resources>