Merge remote-tracking branch 'my_android/master'

# Conflicts:
#	app/src/main/java/com/android/activity/adapter/StaggerAdapter.java
#	app/src/main/java/com/android/activity/fragment/GoodsTypeFragment.java
#	app/src/main/java/com/android/model/goods/GoodsHttp_interface.java
#	app/src/main/java/com/android/model/goods/GoodsModelimpl.java
#	app/src/main/res/layout/item_stagger.xml
#	app/src/main/res/values/strings.xml

.idea/misc.xml

@@ -4,7 +4,7 @@
     <option name="filePathToZoomLevelMap">
       <map>
         <entry key="..\:/Users/HP/Desktop/android_Course_setting/androidF/android_course_design/app/src/main/res/layout/goods_show_item.xml" value="0.25" />
-        <entry key="..\:/Users/HP/Desktop/android_Course_setting/androidF/android_course_design/app/src/main/res/layout/item_stagger.xml" value="0.5" />
+        <entry key="..\:/Users/HP/Desktop/android_Course_setting/androidF/android_course_design/app/src/main/res/layout/item_stagger.xml" value="0.3729166666666667" />
         <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/drawable/baseline_account_circle_18.xml" value="0.1345" />
         <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/drawable/baseline_account_circle_20.xml" value="0.1345" />
         <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/drawable/baseline_account_circle_24.xml" value="0.1345" />