答辩作品

master
FanLibin 6 years ago
parent efb976d44a
commit 1a2621db9c

@ -6,7 +6,7 @@
</shared>
</component>
<component name="AndroidLogFilters">
<option name="TOOL_WINDOW_CUSTOM_FILTER" value="11111" />
<option name="TOOL_WINDOW_CUSTOM_FILTER" value="datadata" />
<option name="TOOL_WINDOW_LOG_LEVEL" value="verbose" />
<option name="TOOL_WINDOW_CONFIGURED_FILTER" value="No Filters" />
</component>
@ -22,7 +22,7 @@
<component name="DefaultGradleProjectSettings">
<option name="isMigrated" value="true" />
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="TEV0217330002981" />
<component name="ExecutionTargetManager" SELECTED_TARGET="Nexus_5_API_27" />
<component name="ExternalProjectsManager">
<system id="GRADLE">
<state>
@ -32,122 +32,112 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/SLogin/DBUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357">
<caret line="711" column="31" lean-forward="true" selection-start-line="711" selection-start-column="31" selection-end-line="711" selection-end-column="31" />
<state relative-caret-position="190">
<caret line="35" lean-forward="true" selection-start-line="35" selection-end-line="35" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/OrderItemBean.java">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/OrderAdapter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="17" column="5" lean-forward="true" selection-start-line="17" selection-start-column="5" selection-end-line="17" selection-end-column="5" />
<state>
<caret line="49" lean-forward="true" selection-start-line="49" selection-end-line="49" />
<folding>
<element signature="e#144#145#0" expanded="true" />
<element signature="e#176#177#0" expanded="true" />
<element signature="e#210#211#0" expanded="true" />
<element signature="e#237#238#0" expanded="true" />
<element signature="e#280#281#0" expanded="true" />
<element signature="e#312#313#0" expanded="true" />
<element signature="e#346#347#0" expanded="true" />
<element signature="e#373#374#0" expanded="true" />
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/OrderAdapter.java">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/ProductAdapter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="266">
<caret line="14" column="34" lean-forward="true" selection-start-line="14" selection-start-column="34" selection-end-line="14" selection-end-column="45" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<state relative-caret-position="76">
<caret line="21" column="49" selection-start-line="21" selection-start-column="49" selection-end-line="21" selection-end-column="49" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/OrderItemAdapter.java">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/PayActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="445">
<caret line="70" column="44" selection-start-line="70" selection-start-column="44" selection-end-line="70" selection-end-column="44" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<state relative-caret-position="255">
<caret line="115" column="16" selection-start-line="115" selection-start-column="16" selection-end-line="115" selection-end-column="16" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/OrderItemUtils.java">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/SLogin/LoginActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304">
<caret line="16" column="22" lean-forward="true" selection-start-line="16" selection-start-column="22" selection-end-line="16" selection-end-column="22" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<state relative-caret-position="292">
<caret line="58" column="42" lean-forward="true" selection-start-line="58" selection-start-column="42" selection-end-line="58" selection-end-column="42" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/CartUtils.java">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/userinfo_change.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190">
<caret line="20" column="4" lean-forward="true" selection-start-line="20" selection-start-column="4" selection-end-line="29" selection-end-column="5" />
<state relative-caret-position="146">
<caret line="86" column="17" lean-forward="true" selection-start-line="86" selection-start-column="17" selection-end-line="86" selection-end-column="17" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/order_item_item.xml">
<provider editor-type-id="android-designer2" />
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/UserInfoActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="266">
<caret line="14" column="34" lean-forward="true" selection-start-line="14" selection-start-column="34" selection-end-line="14" selection-end-column="34" />
<state relative-caret-position="445">
<caret line="51" column="56" selection-start-line="51" selection-start-column="56" selection-end-line="51" selection-end-column="56" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1309#1647#0" expanded="true" />
<element signature="e#1646#1647#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_order_item.xml">
<provider editor-type-id="android-designer2" />
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/MainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="133">
<caret line="7" column="13" lean-forward="true" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
<state relative-caret-position="-1710">
<caret line="69" column="11" selection-start-line="69" selection-start-column="11" selection-end-line="69" selection-end-column="11" />
<folding>
<element signature="e#4718#4719#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/OrderFragment1.java">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/Shopping_CartFragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247">
<caret line="52" column="31" selection-start-line="52" selection-start-column="31" selection-end-line="52" selection-end-column="42" />
<state relative-caret-position="551">
<caret line="104" column="75" lean-forward="true" selection-start-line="104" selection-start-column="75" selection-end-line="104" selection-end-column="75" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#2103#2318#0" expanded="true" />
<element signature="e#2317#2318#0" expanded="true" />
<element signature="e#1048#1058#0" expanded="true" />
<element signature="e#2695#3478#0" expanded="true" />
<element signature="e#3477#3478#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/OrderItem.java">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/ShopFragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="48" column="44" selection-start-line="48" selection-start-column="44" selection-end-line="48" selection-end-column="44" />
<state relative-caret-position="336">
<caret line="66" column="21" lean-forward="true" selection-start-line="66" selection-start-column="21" selection-end-line="66" selection-end-column="21" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1875#2090#0" expanded="true" />
<element signature="e#2089#2090#0" expanded="true" />
<element signature="e#2206#2207#0" expanded="true" />
</folding>
</state>
</provider>
@ -190,41 +180,41 @@
<option value="$PROJECT_DIR$/app/src/main/java/com/example/test/SLogin/SplashActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/test/SLogin/RegisterActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/test/MyChange.java" />
<option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/test/MainActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/test/SLogin/LoginActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_shopping_cart.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_shop.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_user_info.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/userinfo_change.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/test/UserInfoActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/test/MyChangeActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_pay.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/test/CartBean.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/test/PayActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_user.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_order.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/test/Shopping_CartFragment.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/test/MyinfoFragment.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/test/Orderfragment.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/test/OrderUtils.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/order_item.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/test/OrderBean.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/test/OrderAdapter.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/test/OrderItemBean.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/order_item_item.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_order_item.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/test/OrderFragment1.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/test/OrderItemUtils.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/test/SLogin/DBUtils.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/test/OrderItem.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_shopping_cart.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_user_info.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_pay.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/test/OrderItemBean.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/test/OrderItemAdapter.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/test/OrderFragment1.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/test/OrderItem.java" />
<option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/test/SLogin/DBUtils.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/test/OrderAdapter.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/test/Shopping_CartFragment.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/userinfo_change.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/test/PayActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/test/MainActivity.java" />
</list>
</option>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="483" />
<option name="y" value="62" />
<option name="x" value="482" />
<option name="y" value="61" />
<option name="width" value="980" />
<option name="height" value="1040" />
</component>
@ -234,9 +224,9 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="PackagesPane" />
<pane id="ProjectPane" />
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="AndroidView">
<subPane>
<expand>
@ -278,12 +268,6 @@
<item name="java (generated)" type="edd41e36:AndroidSourceTypeNode" />
<item name="test" type="cbb59c9e:AndroidPsiDirectoryNode" />
</path>
<path>
<item name="test" type="1abcf292:AndroidViewProjectNode" />
<item name="app" type="feadf853:AndroidModuleNode" />
<item name="java (generated)" type="edd41e36:AndroidSourceTypeNode" />
<item name="test" type="cbb59c9e:AndroidPsiDirectoryNode" />
</path>
<path>
<item name="test" type="1abcf292:AndroidViewProjectNode" />
<item name="app" type="feadf853:AndroidModuleNode" />
@ -425,8 +409,8 @@
<window_info id="Resources Explorer" order="7" />
<window_info id="Capture Tool" order="8" />
<window_info active="true" anchor="bottom" id="Find" order="0" visible="true" weight="0.1980198" />
<window_info anchor="bottom" id="Run" order="1" weight="0.15275814" />
<window_info anchor="bottom" id="Logcat" order="2" weight="0.32107496" />
<window_info anchor="bottom" id="Run" order="1" weight="0.18811882" />
<window_info anchor="bottom" id="Logcat" order="2" visible="true" weight="0.04384724" />
<window_info anchor="bottom" id="TODO" order="3" />
<window_info anchor="bottom" id="Debug" order="4" weight="0.32673267" />
<window_info anchor="bottom" id="Terminal" order="5" />
@ -495,30 +479,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/userinfo_change.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1026">
<caret line="54" column="8" selection-start-line="54" selection-start-column="8" selection-end-line="54" selection-end-column="8" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_pay.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2774">
<caret line="146" column="43" selection-start-line="146" selection-start-column="43" selection-end-line="146" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_user_info.xml">
<provider selected="true" editor-type-id="android-designer2" />
<provider editor-type-id="text-editor">
<state relative-caret-position="3933">
<caret line="207" column="17" selection-end-line="210" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/ProductUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="228">
@ -533,52 +493,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/PayActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-17">
<caret line="88" column="42" lean-forward="true" selection-start-line="88" selection-start-column="42" selection-end-line="88" selection-end-column="42" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/UserInfoActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-427">
<caret line="47" column="42" selection-start-line="47" selection-start-column="42" selection-end-line="47" selection-end-column="42" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1309#1647#0" expanded="true" />
<element signature="e#1646#1647#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_shopping_cart.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="380">
<caret line="26" column="39" lean-forward="true" selection-start-line="20" selection-start-column="8" selection-end-line="26" selection-end-column="39" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
<provider editor-type-id="android-manifest" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="405">
<caret line="29" column="18" lean-forward="true" selection-start-line="29" selection-start-column="18" selection-end-line="29" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/MainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="290">
<caret line="150" column="16" lean-forward="true" selection-start-line="150" selection-start-column="16" selection-end-line="150" selection-end-column="39" />
<folding>
<element signature="e#4071#4072#0" expanded="true" />
<element signature="e#4144#4145#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_shop.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
@ -587,14 +501,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_user.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="412">
<caret line="59" column="38" lean-forward="true" selection-start-line="59" selection-start-column="38" selection-end-line="59" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
@ -603,31 +509,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/total.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
<state>
<caret selection-end-line="14" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/ShopFragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="494">
<caret line="95" column="6" lean-forward="true" selection-start-line="87" selection-start-column="4" selection-end-line="95" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/MyChangeActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="258">
<caret line="54" column="32" lean-forward="true" selection-start-line="54" selection-start-column="32" selection-end-line="54" selection-end-column="32" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.fragment/fragment/1.1.0/b9ebb04df2cb0cad4419af3c658690bc82aa5706/fragment-1.1.0-sources.jar!/androidx/fragment/app/FragmentManagerImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="151">
@ -646,25 +527,7 @@
<provider selected="true" editor-type-id="android-designer2" />
<provider editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/SLogin/LoginActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="64">
<caret line="43" selection-start-line="43" selection-end-line="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/Orderfragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="392">
<caret line="45" column="88" lean-forward="true" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="88" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#2040#2255#0" expanded="true" />
<element signature="e#2254#2255#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/Orderfragment.java" />
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/UserBean.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="342">
@ -672,13 +535,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/ProductAdapter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="76">
<caret line="21" column="49" selection-start-line="21" selection-start-column="49" selection-end-line="21" selection-end-column="49" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/OrderUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="294">
@ -719,41 +575,36 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/product_item.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_order.xml">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/order_item.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="15" column="15" lean-forward="true" selection-end-line="15" selection-end-column="15" />
<state>
<caret selection-end-line="26" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/Shopping_CartFragment.java">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/OrderItemUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="455">
<caret line="102" column="62" lean-forward="true" selection-start-line="102" selection-start-column="8" selection-end-line="102" selection-end-column="62" />
<state relative-caret-position="228">
<caret line="16" column="22" selection-start-line="16" selection-start-column="22" selection-end-line="16" selection-end-column="22" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1048#1058#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/MyinfoFragment.java">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/CartUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="75" column="85" lean-forward="true" selection-start-line="66" selection-start-column="20" selection-end-line="75" selection-end-column="85" />
<state relative-caret-position="190">
<caret line="20" column="4" selection-start-line="20" selection-start-column="4" selection-end-line="29" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/order_item.xml">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/order_item_item.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
<state>
<caret selection-end-line="26" selection-end-column="15" />
<state relative-caret-position="266">
<caret line="14" column="34" selection-start-line="14" selection-start-column="34" selection-end-line="14" selection-end-column="34" />
</state>
</provider>
</entry>
@ -761,102 +612,214 @@
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="133">
<caret line="7" column="13" lean-forward="true" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
<caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/order_item_item.xml">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/product_item.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/total.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="266">
<caret line="14" column="34" lean-forward="true" selection-start-line="14" selection-start-column="34" selection-end-line="14" selection-end-column="34" />
<state relative-caret-position="209">
<caret line="11" column="31" lean-forward="true" selection-start-line="11" selection-start-column="31" selection-end-line="11" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_shopping_cart.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345">
<caret line="43" column="49" lean-forward="true" selection-start-line="43" selection-start-column="49" selection-end-line="43" selection-end-column="49" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_user.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="412">
<caret line="59" column="38" lean-forward="true" selection-start-line="59" selection-start-column="38" selection-end-line="59" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_user_info.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="48">
<caret line="194" column="37" lean-forward="true" selection-start-line="194" selection-start-column="37" selection-end-line="194" selection-end-column="37" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_pay.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="269">
<caret line="38" column="48" lean-forward="true" selection-start-line="38" selection-start-column="48" selection-end-line="38" selection-end-column="48" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/OrderItemBean.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="17" column="5" lean-forward="true" selection-start-line="17" selection-start-column="5" selection-end-line="17" selection-end-column="5" />
<state relative-caret-position="285">
<caret line="23" column="1" lean-forward="true" selection-start-line="23" selection-start-column="1" selection-end-line="23" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/OrderItemAdapter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="310">
<caret line="69" column="51" lean-forward="true" selection-start-line="69" selection-start-column="51" selection-end-line="69" selection-end-column="51" />
<folding>
<element signature="e#144#145#0" expanded="true" />
<element signature="e#176#177#0" expanded="true" />
<element signature="e#210#211#0" expanded="true" />
<element signature="e#237#238#0" expanded="true" />
<element signature="e#280#281#0" expanded="true" />
<element signature="e#312#313#0" expanded="true" />
<element signature="e#346#347#0" expanded="true" />
<element signature="e#373#374#0" expanded="true" />
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/CartUtils.java">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/MyChangeActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190">
<caret line="20" column="4" lean-forward="true" selection-start-line="20" selection-start-column="4" selection-end-line="29" selection-end-column="5" />
<state relative-caret-position="258">
<caret line="42" column="49" lean-forward="true" selection-start-line="40" selection-start-column="4" selection-end-line="42" selection-end-column="49" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/OrderAdapter.java">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/OrderFragment1.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="266">
<caret line="14" column="34" lean-forward="true" selection-start-line="14" selection-start-column="34" selection-end-line="14" selection-end-column="45" />
<state relative-caret-position="821">
<caret line="68" selection-start-line="68" selection-end-line="68" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/OrderItemUtils.java">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/OrderItem.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304">
<caret line="16" column="22" lean-forward="true" selection-start-line="16" selection-start-column="22" selection-end-line="16" selection-end-column="22" />
<state relative-caret-position="217">
<caret line="19" column="22" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="22" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/SLogin/DBUtils.java">
<entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357">
<caret line="711" column="31" lean-forward="true" selection-start-line="711" selection-start-column="31" selection-end-line="711" selection-end-column="31" />
<state relative-caret-position="286">
<caret line="20" lean-forward="true" selection-start-line="20" selection-end-line="20" />
</state>
</provider>
<provider editor-type-id="android-manifest" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/OrderFragment1.java">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/MyinfoFragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="42" column="9" lean-forward="true" selection-start-line="37" selection-start-column="8" selection-end-line="42" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_order.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="15" column="15" lean-forward="true" selection-start-line="15" selection-start-column="15" selection-end-line="15" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/UserInfoActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247">
<caret line="52" column="31" selection-start-line="52" selection-start-column="31" selection-end-line="52" selection-end-column="42" />
<state relative-caret-position="445">
<caret line="51" column="56" selection-start-line="51" selection-start-column="56" selection-end-line="51" selection-end-column="56" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#2103#2318#0" expanded="true" />
<element signature="e#2317#2318#0" expanded="true" />
<element signature="e#1309#1647#0" expanded="true" />
<element signature="e#1646#1647#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/OrderItem.java">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/ProductAdapter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="48" column="44" selection-start-line="48" selection-start-column="44" selection-end-line="48" selection-end-column="44" />
<state relative-caret-position="76">
<caret line="21" column="49" selection-start-line="21" selection-start-column="49" selection-end-line="21" selection-end-column="49" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/OrderAdapter.java">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret line="49" lean-forward="true" selection-start-line="49" selection-end-line="49" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1875#2090#0" expanded="true" />
<element signature="e#2089#2090#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/OrderItemAdapter.java">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/userinfo_change.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="445">
<caret line="70" column="44" selection-start-line="70" selection-start-column="44" selection-end-line="70" selection-end-column="44" />
<state relative-caret-position="146">
<caret line="86" column="17" lean-forward="true" selection-start-line="86" selection-start-column="17" selection-end-line="86" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/ShopFragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336">
<caret line="66" column="21" lean-forward="true" selection-start-line="66" selection-start-column="21" selection-end-line="66" selection-end-column="21" />
<folding>
<element signature="e#2206#2207#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/SLogin/LoginActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="292">
<caret line="58" column="42" lean-forward="true" selection-start-line="58" selection-start-column="42" selection-end-line="58" selection-end-column="42" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/Shopping_CartFragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="551">
<caret line="104" column="75" lean-forward="true" selection-start-line="104" selection-start-column="75" selection-end-line="104" selection-end-column="75" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1048#1058#0" expanded="true" />
<element signature="e#2695#3478#0" expanded="true" />
<element signature="e#3477#3478#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/PayActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="115" column="16" selection-start-line="115" selection-start-column="16" selection-end-line="115" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/MainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1710">
<caret line="69" column="11" selection-start-line="69" selection-start-column="11" selection-end-line="69" selection-end-column="11" />
<folding>
<element signature="e#4718#4719#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/test/SLogin/DBUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190">
<caret line="35" lean-forward="true" selection-start-line="35" selection-end-line="35" />
</state>
</provider>
</entry>
</component>
</project>

@ -36,6 +36,7 @@
<activity android:name="com.example.test.SLogin.RegisterActivity" />
<activity android:name="com.example.test.UserInfoActivity" />
<activity android:name="com.example.test.MyChangeActivity" />
<activity android:name="com.example.test.OrderItem" />
<provider
android:name="com.squareup.picasso.PicassoProvider"

@ -1,4 +1,4 @@
#Mon Jan 06 22:53:19 GMT+08:00 2020
#Tue Jan 07 11:51:08 GMT+08:00 2020
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\layout\\abc_tooltip.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_abc_tooltip.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxhdpi-v4\\abc_ic_menu_share_mtrl_alpha.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4_abc_ic_menu_share_mtrl_alpha.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-mdpi-v4\\abc_ic_menu_selectall_mtrl_alpha.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4_abc_ic_menu_selectall_mtrl_alpha.png.flat
@ -24,8 +24,8 @@ C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxxhdpi-v4\\abc_ic_star_black_36dp.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_ic_star_black_36dp.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-xxxhdpi-v4\\abc_btn_check_to_on_mtrl_015.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4_abc_btn_check_to_on_mtrl_015.png.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\anim\\btn_radio_to_off_mtrl_ring_outer_animation.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\anim_btn_radio_to_off_mtrl_ring_outer_animation.xml.flat
F\:\\diedai2\\test\\app\\src\\main\\res\\layout\\order_item_item.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_order_item_item.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\drawable-hdpi-v4\\abc_text_select_handle_right_mtrl_dark.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4_abc_text_select_handle_right_mtrl_dark.png.flat
F\:\\diedai2\\test\\app\\src\\main\\res\\layout\\order_item_item.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_order_item_item.xml.flat
C\:\\Users\\jhon\\.gradle\\caches\\transforms-2\\files-2.1\\d74b5b498b35fd5cb32d0a6997bb1d3d\\appcompat-1.1.0\\res\\anim\\btn_radio_to_off_mtrl_ring_outer_path_animation.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\anim_btn_radio_to_off_mtrl_ring_outer_path_animation.xml.flat
F\:\\diedai2\\test\\app\\src\\main\\res\\drawable\\user_name_icon.png=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\drawable_user_name_icon.png.flat
F\:\\diedai2\\test\\app\\src\\main\\res\\layout\\total.xml=F\:\\diedai2\\test\\app\\build\\intermediates\\res\\merged\\debug\\layout_total.xml.flat

@ -1,4 +1,4 @@
#Mon Jan 06 23:39:13 GMT+08:00 2020
#Tue Jan 07 12:47:38 GMT+08:00 2020
base.0=F\:\\diedai2\\test\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\out\\classes.dex
path.0=classes.dex
renamed.0=classes.dex

@ -37,6 +37,7 @@
<activity android:name="com.example.test.SLogin.RegisterActivity" />
<activity android:name="com.example.test.UserInfoActivity" />
<activity android:name="com.example.test.MyChangeActivity" />
<activity android:name="com.example.test.OrderItem" />
<provider
android:name="com.squareup.picasso.PicassoProvider"

@ -21,7 +21,7 @@
13-->F:\diedai2\test\app\src\main\AndroidManifest.xml:7:22-73
14
15 <application
15-->F:\diedai2\test\app\src\main\AndroidManifest.xml:9:5-30:19
15-->F:\diedai2\test\app\src\main\AndroidManifest.xml:9:5-31:19
16 android:allowBackup="true"
16-->F:\diedai2\test\app\src\main\AndroidManifest.xml:11:9-35
17 android:appComponentFactory="androidx.core.app.CoreComponentFactory"
@ -72,15 +72,18 @@
38 <activity android:name="com.example.test.MyChangeActivity" />
38-->F:\diedai2\test\app\src\main\AndroidManifest.xml:29:9-54
38-->F:\diedai2\test\app\src\main\AndroidManifest.xml:29:19-51
39
40 <provider
40-->[com.squareup.picasso:picasso:2.71828] C:\Users\jhon\.gradle\caches\transforms-2\files-2.1\1da9f9f25826f4c834b7ea9c2cecd368\jetified-picasso-2.71828\AndroidManifest.xml:8:9-11:40
41 android:name="com.squareup.picasso.PicassoProvider"
41-->[com.squareup.picasso:picasso:2.71828] C:\Users\jhon\.gradle\caches\transforms-2\files-2.1\1da9f9f25826f4c834b7ea9c2cecd368\jetified-picasso-2.71828\AndroidManifest.xml:9:13-64
42 android:authorities="com.example.test.com.squareup.picasso"
42-->[com.squareup.picasso:picasso:2.71828] C:\Users\jhon\.gradle\caches\transforms-2\files-2.1\1da9f9f25826f4c834b7ea9c2cecd368\jetified-picasso-2.71828\AndroidManifest.xml:10:13-72
43 android:exported="false" />
43-->[com.squareup.picasso:picasso:2.71828] C:\Users\jhon\.gradle\caches\transforms-2\files-2.1\1da9f9f25826f4c834b7ea9c2cecd368\jetified-picasso-2.71828\AndroidManifest.xml:11:13-37
44 </application>
45
46</manifest>
39 <activity android:name="com.example.test.OrderItem" />
39-->F:\diedai2\test\app\src\main\AndroidManifest.xml:30:9-47
39-->F:\diedai2\test\app\src\main\AndroidManifest.xml:30:19-44
40
41 <provider
41-->[com.squareup.picasso:picasso:2.71828] C:\Users\jhon\.gradle\caches\transforms-2\files-2.1\1da9f9f25826f4c834b7ea9c2cecd368\jetified-picasso-2.71828\AndroidManifest.xml:8:9-11:40
42 android:name="com.squareup.picasso.PicassoProvider"
42-->[com.squareup.picasso:picasso:2.71828] C:\Users\jhon\.gradle\caches\transforms-2\files-2.1\1da9f9f25826f4c834b7ea9c2cecd368\jetified-picasso-2.71828\AndroidManifest.xml:9:13-64
43 android:authorities="com.example.test.com.squareup.picasso"
43-->[com.squareup.picasso:picasso:2.71828] C:\Users\jhon\.gradle\caches\transforms-2\files-2.1\1da9f9f25826f4c834b7ea9c2cecd368\jetified-picasso-2.71828\AndroidManifest.xml:10:13-72
44 android:exported="false" />
44-->[com.squareup.picasso:picasso:2.71828] C:\Users\jhon\.gradle\caches\transforms-2\files-2.1\1da9f9f25826f4c834b7ea9c2cecd368\jetified-picasso-2.71828\AndroidManifest.xml:11:13-37
45 </application>
46
47</manifest>

@ -36,6 +36,7 @@
<activity android:name="com.example.test.SLogin.RegisterActivity" />
<activity android:name="com.example.test.UserInfoActivity" />
<activity android:name="com.example.test.MyChangeActivity" />
<activity android:name="com.example.test.OrderItem" />
<provider
android:name="com.squareup.picasso.PicassoProvider"

@ -1,9 +1,9 @@
-- Merging decision tree log ---
manifest
ADDED from F:\diedai2\test\app\src\main\AndroidManifest.xml:2:1-32:12
INJECTED from F:\diedai2\test\app\src\main\AndroidManifest.xml:2:1-32:12
INJECTED from F:\diedai2\test\app\src\main\AndroidManifest.xml:2:1-32:12
INJECTED from F:\diedai2\test\app\src\main\AndroidManifest.xml:2:1-32:12
ADDED from F:\diedai2\test\app\src\main\AndroidManifest.xml:2:1-33:12
INJECTED from F:\diedai2\test\app\src\main\AndroidManifest.xml:2:1-33:12
INJECTED from F:\diedai2\test\app\src\main\AndroidManifest.xml:2:1-33:12
INJECTED from F:\diedai2\test\app\src\main\AndroidManifest.xml:2:1-33:12
MERGED from [androidx.constraintlayout:constraintlayout:1.1.3] C:\Users\jhon\.gradle\caches\transforms-2\files-2.1\508ac768b50158a079142e4dc4915061\constraintlayout-1.1.3\AndroidManifest.xml:2:1-11:12
MERGED from [androidx.appcompat:appcompat:1.1.0] C:\Users\jhon\.gradle\caches\transforms-2\files-2.1\d74b5b498b35fd5cb32d0a6997bb1d3d\appcompat-1.1.0\AndroidManifest.xml:17:1-24:12
MERGED from [com.squareup.picasso:picasso:2.71828] C:\Users\jhon\.gradle\caches\transforms-2\files-2.1\1da9f9f25826f4c834b7ea9c2cecd368\jetified-picasso-2.71828\AndroidManifest.xml:2:1-14:12
@ -27,20 +27,20 @@ MERGED from [androidx.interpolator:interpolator:1.0.0] C:\Users\jhon\.gradle\cac
MERGED from [androidx.lifecycle:lifecycle-livedata:2.0.0] C:\Users\jhon\.gradle\caches\transforms-2\files-2.1\df65787e67fe4b4bc0635deed9695797\lifecycle-livedata-2.0.0\AndroidManifest.xml:17:1-22:12
MERGED from [androidx.lifecycle:lifecycle-livedata-core:2.0.0] C:\Users\jhon\.gradle\caches\transforms-2\files-2.1\a1f5477cd6fd5fad9baa3e263bec7d60\lifecycle-livedata-core-2.0.0\AndroidManifest.xml:17:1-22:12
MERGED from [androidx.arch.core:core-runtime:2.0.0] C:\Users\jhon\.gradle\caches\transforms-2\files-2.1\60b50828def4ba3859898ffb4c971c21\core-runtime-2.0.0\AndroidManifest.xml:17:1-22:12
INJECTED from F:\diedai2\test\app\src\main\AndroidManifest.xml:2:1-32:12
INJECTED from F:\diedai2\test\app\src\main\AndroidManifest.xml:2:1-32:12
INJECTED from F:\diedai2\test\app\src\main\AndroidManifest.xml:2:1-32:12
INJECTED from F:\diedai2\test\app\src\main\AndroidManifest.xml:2:1-33:12
INJECTED from F:\diedai2\test\app\src\main\AndroidManifest.xml:2:1-33:12
INJECTED from F:\diedai2\test\app\src\main\AndroidManifest.xml:2:1-33:12
package
ADDED from F:\diedai2\test\app\src\main\AndroidManifest.xml:3:5-31
INJECTED from F:\diedai2\test\app\src\main\AndroidManifest.xml
INJECTED from F:\diedai2\test\app\src\main\AndroidManifest.xml
android:versionName
INJECTED from F:\diedai2\test\app\src\main\AndroidManifest.xml
ADDED from F:\diedai2\test\app\src\main\AndroidManifest.xml:2:1-32:12
ADDED from F:\diedai2\test\app\src\main\AndroidManifest.xml:2:1-33:12
INJECTED from F:\diedai2\test\app\src\main\AndroidManifest.xml
android:versionCode
INJECTED from F:\diedai2\test\app\src\main\AndroidManifest.xml
ADDED from F:\diedai2\test\app\src\main\AndroidManifest.xml:2:1-32:12
ADDED from F:\diedai2\test\app\src\main\AndroidManifest.xml:2:1-33:12
INJECTED from F:\diedai2\test\app\src\main\AndroidManifest.xml
xmlns:android
ADDED from F:\diedai2\test\app\src\main\AndroidManifest.xml:2:11-69
@ -57,7 +57,7 @@ ADDED from F:\diedai2\test\app\src\main\AndroidManifest.xml:7:5-76
android:name
ADDED from F:\diedai2\test\app\src\main\AndroidManifest.xml:7:22-73
application
ADDED from F:\diedai2\test\app\src\main\AndroidManifest.xml:9:5-30:19
ADDED from F:\diedai2\test\app\src\main\AndroidManifest.xml:9:5-31:19
MERGED from [androidx.constraintlayout:constraintlayout:1.1.3] C:\Users\jhon\.gradle\caches\transforms-2\files-2.1\508ac768b50158a079142e4dc4915061\constraintlayout-1.1.3\AndroidManifest.xml:9:5-20
MERGED from [androidx.constraintlayout:constraintlayout:1.1.3] C:\Users\jhon\.gradle\caches\transforms-2\files-2.1\508ac768b50158a079142e4dc4915061\constraintlayout-1.1.3\AndroidManifest.xml:9:5-20
MERGED from [com.squareup.picasso:picasso:2.71828] C:\Users\jhon\.gradle\caches\transforms-2\files-2.1\1da9f9f25826f4c834b7ea9c2cecd368\jetified-picasso-2.71828\AndroidManifest.xml:7:5-12:19
@ -120,6 +120,10 @@ activity#com.example.test.MyChangeActivity
ADDED from F:\diedai2\test\app\src\main\AndroidManifest.xml:29:9-54
android:name
ADDED from F:\diedai2\test\app\src\main\AndroidManifest.xml:29:19-51
activity#com.example.test.OrderItem
ADDED from F:\diedai2\test\app\src\main\AndroidManifest.xml:30:9-47
android:name
ADDED from F:\diedai2\test\app\src\main\AndroidManifest.xml:30:19-44
uses-sdk
INJECTED from F:\diedai2\test\app\src\main\AndroidManifest.xml reason: use-sdk injection requested
INJECTED from F:\diedai2\test\app\src\main\AndroidManifest.xml

@ -27,6 +27,7 @@
<activity android:name=".SLogin.RegisterActivity" />
<activity android:name=".UserInfoActivity" />
<activity android:name=".MyChangeActivity" />
<activity android:name=".OrderItem" />
</application>
</manifest>

@ -100,6 +100,21 @@ public class MainActivity extends FragmentActivity implements View.OnClickListen
Intent intent = getIntent();
ID = intent.getIntExtra("ID",0);
ShopFragment fragment1 = new ShopFragment();
Bundle bundle1 = new Bundle();
bundle1.putInt("data1",ID);
//Log.v("OWWWWWW",bundle1+"");
fragment1.setArguments(bundle1);//
//Log.v("OOOOOOO",fragment1.getArguments()+"");
FragmentManager fragmentManager1 = getSupportFragmentManager();
FragmentTransaction fragmentTransaction1 = fragmentManager1.beginTransaction();
fragmentTransaction1.replace(R.id.main_body,fragment1);
fragmentTransaction1.commit();
}
@ -230,5 +245,7 @@ public class MainActivity extends FragmentActivity implements View.OnClickListen
}
}
}

@ -70,8 +70,8 @@ public class OrderAdapter extends BaseAdapter {
OrderBean bean = list.get(position);
//4.将数据设置给这些子控件做显示
orderId.setText(bean.getOrderId()+"");
orderTime.setText(bean.getOrderTime());
orderId.setText("订单编号:" + bean.getOrderId()+"");
orderTime.setText("订单生成时间:" + bean.getOrderTime());
return view;
}

@ -62,14 +62,11 @@ public class OrderFragment1 extends Fragment implements AdapterView.OnItemClickL
Obean = (OrderBean) parent.getItemAtPosition(position);
OrderItem fragment = new OrderItem();
Bundle bundle = new Bundle();
bundle.putInt("data",Obean.getOrderId());
fragment.setArguments(bundle);
FragmentManager fragmentManager = (OrderFragment1.this).getFragmentManager();
FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
fragmentTransaction.replace(R.id.main_body,fragment);
fragmentTransaction.commit();
Intent intent = new Intent(getContext(), OrderItem.class);
Bundle bundle1 = new Bundle();
bundle1.putInt("OrderID", Obean.getOrderId());
intent.putExtras(bundle1);
getContext().startActivity(intent);
Toast.makeText(getActivity(), "订单明细", Toast.LENGTH_SHORT).show();
}

@ -1,5 +1,6 @@
package com.example.test;
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
@ -10,53 +11,60 @@ import android.view.ViewGroup;
import android.widget.ListAdapter;
import android.widget.ListView;
import androidx.appcompat.app.AppCompatActivity;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import java.util.ArrayList;
public class OrderItem extends Fragment {
public class OrderItem extends AppCompatActivity {
int mess;
OrderItemAdapter orderitemadapter;
private ListView order_item_list;
ArrayList<OrderItemBean> list = new ArrayList<>();
public OrderItem() {
// Required empty public constructor
}
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// public OrderItem() {void
// // Required empty public constructor
// }
Bundle bundle =this.getArguments();//得到从Activity传来的数据
//Log.v("YDYDYDYDY",bundle+"");
if(bundle!=null) {
mess = bundle.getInt("data");
//Log.v("YYYYYYYYY",mess+"");
}
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.fragment_order_item);
return inflater.inflate(R.layout.fragment_order_item, container, false);
}
Intent intent = getIntent();
mess = intent.getIntExtra("OrderID",529);
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
orderitemadapter = new OrderItemAdapter(getActivity().getApplicationContext() , list);
orderitemadapter = new OrderItemAdapter(this , list);
//Log.d("NNNNNN",new OrderAdapter(getActivity().getApplicationContext(), list).toString());
order_item_list = (ListView)view.findViewById(R.id.order_list_view_item);
order_item_list = (ListView)findViewById(R.id.order_list_view_item);
order_item_list.setAdapter(orderitemadapter);
new UploadOrderItemThread().start();
// return inflater.inflate(R.layout.fragment_order_item, container, false);
}
// public void onViewCreated(View view, Bundle savedInstanceState) {
// super.onViewCreated(view, savedInstanceState);
// orderitemadapter = new OrderItemAdapter(getActivity().getApplicationContext() , list);
// //Log.d("NNNNNN",new OrderAdapter(getActivity().getApplicationContext(), list).toString());
// order_item_list = (ListView)view.findViewById(R.id.order_list_view_item);
// order_item_list.setAdapter(orderitemadapter);
//
// new UploadOrderItemThread().start();
// }
private class UploadOrderItemThread extends Thread{
public void run() {
Message message = mhandler.obtainMessage();
int isload = OrderItemUtils.getAllOrderItem(getActivity().getApplicationContext(),list ,mess);
int isload = OrderItemUtils.getAllOrderItem(OrderItem.this,list ,mess);
//Log.v("77777",mess+"");
//Log.v("77777",isload+"");
message.what = isload;

@ -62,13 +62,13 @@ public class OrderItemAdapter extends BaseAdapter {
}
//2.获取view上的子控件对象
TextView orderName = (TextView) view.findViewById(R.id.order_item);
TextView orderPrice = (TextView) view.findViewById(R.id.order_price_item);
TextView orderCount = (TextView) view.findViewById(R.id.order_price_item);
//3.获取postion位置条目对应的list集合中的新闻数据Bean对象
OrderItemBean bean = list.get(position);
//4.将数据设置给这些子控件做显示
orderName.setText(bean.getName());
orderPrice.setText(bean.getPrice()+"");
orderName.setText("商品名:" + bean.getName());
orderCount.setText("数量:" + bean.getCount()+"");
return view;
}

@ -3,7 +3,7 @@ package com.example.test;
public class OrderItemBean {
public String name;
public int price;
public int count;
public void setName(String name){
this.name = name;
@ -13,12 +13,12 @@ public class OrderItemBean {
return name;
}
public void setPrice(int price){
this.price = price;
public void setCount(int count){
this.count = count;
}
public int getPrice(){
return price;
public int getCount(){
return count;
}
}

@ -1,6 +1,8 @@
package com.example.test;
import androidx.appcompat.app.AppCompatActivity;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import android.content.Intent;
import android.os.Bundle;
@ -68,8 +70,18 @@ public class PayActivity extends AppCompatActivity {
// toast.show();
// }
// finish();
}
});
// Intent intent1 = new Intent(PayActivity.this , Shopping_CartFragment.class);
//
// intent.putExtra("key",1);
//// Log.v("IIIIIID",UserinfoID+"");
//
// startActivity(intent1);
}
private class getPay extends Thread{
@ -100,6 +112,8 @@ public class PayActivity extends AppCompatActivity {
db = new DBUtils();
CartBean bean=new CartBean();
db.insertOrderDetails(ID,bean);
db.deleteshoppingcart(ID);
finish();
}else {
message.what = 3;

@ -22,6 +22,7 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@ -603,8 +604,10 @@ public class DBUtils extends Thread {
ps.setInt(1, userId);
ps.setInt(2, addressId);
// 获取时间
Date date = getNetTime();
String time=date.toString();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss ");
String time=simpleDateFormat.format(date);
ps.setNString(3,time);
int orderId = -1;
ps.executeUpdate();
@ -667,7 +670,10 @@ public class DBUtils extends Thread {
// int Gid = id;
Statement st = null;
String sql = "select * from user_order where user_id = ?";
String sql = "select * \n" +
"from user_order \n" +
"where user_id = ? \n" +
"ORDER BY order_id desc";
try {
st = conn.createStatement();
@ -711,7 +717,7 @@ public class DBUtils extends Thread {
ResultSet rs = ps.executeQuery();
while (rs.next()) {
OrderItemBean news = new OrderItemBean();
news.setPrice(rs.getInt("product.product_price"));
news.setCount(rs.getInt("order_details.product_count"));
news.setName(rs.getNString("product.product_name"));
list.add(news);
Log.v("111111",news.getName()+"");
@ -728,5 +734,27 @@ public class DBUtils extends Thread {
}
}
}
public void deleteshoppingcart(int userid) {
Connection conn = getConnection();
Statement st = null;
try {
st = conn.createStatement();
String sql = "delete from shopping_cart where user_id=?";
PreparedStatement ps = conn.prepareStatement(sql);
ps.setInt(1, userid);
ps.executeUpdate();
} catch (SQLException e) {
e.printStackTrace();
} finally {
try {
if (st != null) {
st.close();
}
} catch (SQLException e) {
e.printStackTrace();
}
}
}
}

@ -1,8 +1,10 @@
package com.example.test;
import android.app.Activity;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.SharedPreferences;
import android.os.Bundle;
@ -40,6 +42,7 @@ public class Shopping_CartFragment extends Fragment implements AdapterView.OnIte
TextView tolal_amount;//控件
int mess = 0;//用户Id
Button settle;//结算按钮
int namString;
public Shopping_CartFragment() {
// Required empty public constructor
@ -85,7 +88,7 @@ public class Shopping_CartFragment extends Fragment implements AdapterView.OnIte
Bundle bundle1 = new Bundle();
bundle1.putInt("MyinfoID", mess);
intent.putExtras(bundle1);
getContext().startActivity(intent);
startActivityForResult(intent,1);
Toast toast = Toast.makeText(getActivity().getApplicationContext(), "生成订单", Toast.LENGTH_SHORT);
toast.show();
}else{
@ -95,6 +98,8 @@ public class Shopping_CartFragment extends Fragment implements AdapterView.OnIte
}
});
}
public void onItemClick(AdapterView<?> parent, View view, int position,
@ -117,6 +122,21 @@ public class Shopping_CartFragment extends Fragment implements AdapterView.OnIte
}
// public void onActivityResult(int requestCode, int resultCode, Intent data) {
// super.onActivityResult(requestCode, resultCode, data);
// Bundle bundle = data.getExtras();
// namString = bundle.getInt("date1");
//
// }
public void onResume(){
super.onResume();
new putMoney().start();//启动子线程更新控件里的总价
// Log.v("namnamnam",namString+"");
// if(namString == 1){
// new putMoney().start();
// }
}
private class Cutitem extends Thread{
public void run(){
@ -171,4 +191,6 @@ public class Shopping_CartFragment extends Fragment implements AdapterView.OnIte
}
}

@ -37,7 +37,7 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="5dp"
android:text="username"
android:text=""
android:textColor="#a3a3a3"
android:textSize="14sp" />
</RelativeLayout>
@ -70,7 +70,7 @@
android:layout_centerVertical="true"
android:layout_marginRight="5dp"
android:singleLine="true"
android:text="未添加"
android:text=""
android:textColor="#a3a3a3"
android:textSize="14sp" />
</RelativeLayout>
@ -108,7 +108,7 @@
android:layout_centerVertical="true"
android:layout_marginRight="5dp"
android:singleLine="true"
android:text="未添加"
android:text=""
android:textColor="#a3a3a3"
android:textSize="14sp" />
</RelativeLayout>
@ -136,7 +136,7 @@
android:layout_centerVertical="true"
android:layout_marginRight="5dp"
android:singleLine="true"
android:text="未添加"
android:text=""
android:textColor="#a3a3a3"
android:textSize="14sp" />
</RelativeLayout>

@ -59,7 +59,7 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="5dp"
android:text="username"
android:text=""
android:textColor="#a3a3a3"
android:textSize="14sp" />
</RelativeLayout>
@ -92,7 +92,7 @@
android:layout_centerVertical="true"
android:layout_marginRight="5dp"
android:singleLine="true"
android:text="任子琦"
android:text=""
android:textColor="#a3a3a3"
android:textSize="14sp" />
</RelativeLayout>
@ -156,7 +156,7 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:text="Phone"
android:text=""
android:layout_marginRight="5dp"
android:textColor="#a3a3a3"
@ -193,7 +193,7 @@
android:layout_centerVertical="true"
android:layout_marginRight="5dp"
android:singleLine="true"
android:text="未添加"
android:text=""
android:textColor="#a3a3a3"
android:textSize="14sp" />
</RelativeLayout>

@ -42,7 +42,7 @@
android:layout_toLeftOf="@+id/sum_price"
android:layout_weight="1"
android:gravity="center_vertical"
android:text="总计:0元" />
android:text="总计:" />
<Button
android:id="@+id/sum_price"

@ -58,6 +58,7 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:gravity="right"
android:layout_marginRight="5dp"
android:text=" "
android:textColor="#a3a3a3"
@ -83,14 +84,14 @@
android:text="姓 名"
android:textColor="#000"
android:textSize="16sp" />
<EditText
android:id="@+id/tv_true_name"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="5dp"
android:singleLine="true"
android:gravity="right"
android:text=" "
android:textColor="#a3a3a3"
android:textSize="14sp" />
@ -151,12 +152,12 @@
<EditText
android:id="@+id/tv_phone"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="5dp"
android:gravity="right"
android:text=" "
android:textColor="#a3a3a3"
android:textSize="14sp" />
@ -186,12 +187,13 @@
<EditText
android:id="@+id/tv_Raddress"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:layout_marginRight="5dp"
android:singleLine="true"
android:gravity="right"
android:text=" "
android:textColor="#a3a3a3"
android:textSize="14sp" />

Loading…
Cancel
Save