夜画3.0页面修改

.idea/libraries/Gradle__com_alibaba_fastjson_1_1_46_android.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Gradle: com.alibaba:fastjson:1.1.46.android">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/.gradle/caches/modules-2/files-2.1/com.alibaba/fastjson/1.1.46.android/108717c93f7aec31fb86db57cb4ad1e26034c638/fastjson-1.1.46.android.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/.gradle/caches/modules-2/files-2.1/com.alibaba/fastjson/1.1.46.android/1d0adb24eb8ea4c1c8849966047852107eb4c570/fastjson-1.1.46.android-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/.gradle/caches/modules-2/files-2.1/com.alibaba/fastjson/1.1.46.android/3548541a77600015fd668c22a2fe3f7c8aa1a635/fastjson-1.1.46.android-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/modules/YHYXSDK/YHYXSdkDemo.YHYXSDK.androidTest.iml

@@ -33,6 +33,7 @@
     <orderEntry type="library" scope="TEST" name="Gradle: E./workspace/yehua_android/YHYXSDK/libs/open_sdk_r5967.jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: E./workspace/yehua_android/YHYXSDK/libs/httpcore-4.4.11.jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: E./workspace/yehua_android/YHYXSDK/libs/wechat-sdk-android-without-mta-5.1.4.jar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.alibaba:fastjson:1.1.46.android" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="YHYXSdkDemo.YHYXSDK.main" />
 </module>

.idea/modules/YHYXSDK/YHYXSdkDemo.YHYXSDK.main.iml

@@ -24,16 +24,19 @@
       <sourceFolder url="file://$MODULE_DIR$/../../../YHYXSDK/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../YHYXSDK/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../YHYXSDK/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../YHYXSDK/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../YHYXSDK/build/generated/ap_generated_sources/debug/out">
       <sourceFolder url="file://$MODULE_DIR$/../../../YHYXSDK/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../YHYXSDK/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../YHYXSDK/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../YHYXSDK/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../YHYXSDK/build/generated/renderscript_source_output_dir/debug/out">
       <sourceFolder url="file://$MODULE_DIR$/../../../YHYXSDK/build/generated/renderscript_source_output_dir/debug/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../YHYXSDK/build/generated/renderscript_source_output_dir/debug/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../YHYXSDK/build/generated/renderscript_source_output_dir/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../YHYXSDK/build/generated/renderscript_source_output_dir/debug/out" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../YHYXSDK/build/generated/res/resValues/debug">
       <sourceFolder url="file://$MODULE_DIR$/../../../YHYXSDK/build/generated/res/resValues/debug" type="java-resource" />
@@ -45,6 +48,7 @@
       <sourceFolder url="file://$MODULE_DIR$/../../../YHYXSDK/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../YHYXSDK/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../YHYXSDK/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../YHYXSDK/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../YHYXSDK/res">
       <sourceFolder url="file://$MODULE_DIR$/../../../YHYXSDK/res" type="java-resource" />
@@ -61,5 +65,6 @@
     <orderEntry type="library" name="Gradle: E./workspace/yehua_android/YHYXSDK/libs/open_sdk_r5967.jar" level="project" />
     <orderEntry type="library" name="Gradle: E./workspace/yehua_android/YHYXSDK/libs/httpcore-4.4.11.jar" level="project" />
     <orderEntry type="library" name="Gradle: E./workspace/yehua_android/YHYXSDK/libs/wechat-sdk-android-without-mta-5.1.4.jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.alibaba:fastjson:1.1.46.android" level="project" />
   </component>
 </module>

.idea/modules/YHYXSDK/YHYXSdkDemo.YHYXSDK.unitTest.iml

@@ -28,6 +28,7 @@
     <orderEntry type="library" scope="TEST" name="Gradle: E./workspace/yehua_android/YHYXSDK/libs/open_sdk_r5967.jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: E./workspace/yehua_android/YHYXSDK/libs/httpcore-4.4.11.jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: E./workspace/yehua_android/YHYXSDK/libs/wechat-sdk-android-without-mta-5.1.4.jar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.alibaba:fastjson:1.1.46.android" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="YHYXSdkDemo.YHYXSDK.main" />
 </module>

.idea/modules/YHYXSdkDemo/YHYXSdkDemo.YHYXSdkDemo.androidTest.iml

@@ -18,6 +18,7 @@
     <content url="file://$MODULE_DIR$/../../../YHYXSdkDemo/build/generated/ap_generated_sources/debugAndroidTest/out">
       <sourceFolder url="file://$MODULE_DIR$/../../../YHYXSdkDemo/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../YHYXSdkDemo/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../YHYXSdkDemo/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../YHYXSdkDemo/build/generated/renderscript_source_output_dir/debugAndroidTest/out" />
     <content url="file://$MODULE_DIR$/../../../YHYXSdkDemo/build/generated/res/resValues/androidTest/debug">
@@ -27,6 +28,7 @@
     <content url="file://$MODULE_DIR$/../../../YHYXSdkDemo/build/generated/source/buildConfig/androidTest/debug">
       <sourceFolder url="file://$MODULE_DIR$/../../../YHYXSdkDemo/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../YHYXSdkDemo/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../YHYXSdkDemo/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../YHYXSdkDemo/src/androidTestDebug" />
     <content url="file://$MODULE_DIR$/../../../YHYXSdkDemo/tests" />

.idea/modules/YHYXSdkDemo/YHYXSdkDemo.YHYXSdkDemo.main.iml

@@ -46,7 +46,6 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="YHYXSdkDemo.YHYXSdkLib.main" />
     <orderEntry type="module" module-name="YHYXSdkDemo.YHYXSDK.main" />
     <orderEntry type="library" name="Gradle: E./workspace/yehua_android/YHYXSDK/libs/alipaySdk-20180403.jar" level="project" />
     <orderEntry type="library" name="Gradle: E./workspace/yehua_android/YHYXSDK/libs/android-support-v4.jar" level="project" />

YHYXSDK/build.gradle

@@ -13,6 +13,7 @@ dependencies {
 //        exclude module: 'support-v4'
 //        exclude group:'com.android.support'
 //    }
+    implementation 'com.alibaba:fastjson:1.1.46.android'
 }
 
 android {

YHYXSDK/res/drawable/yh_float_model_shape.xml

@@ -1,52 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
- <!-- 边 -->
- <item>
-  <shape android:shape="rectangle">
-   <padding
-    android:bottom="2dp" android:left="2dp" android:top="2dp" android:right="2dp"/>
-   <solid android:color="#00CCCCCC" />
-   <corners android:radius="8dp" />
-<!--   <corners android:topLeftRadius="3dp" android:topRightRadius="3dp" android:bottomLeftRadius="3dp" android:bottomRightRadius="3dp" />-->
-  </shape>
- </item>
- <item>
-  <shape android:shape="rectangle">
-   <padding
-    android:bottom="2dp" android:left="2dp" android:top="2dp" android:right="2dp" />
-   <solid android:color="#10CCCCCC" />
-   <corners android:radius="8dp" />
-<!--   <corners android:topLeftRadius="3dp" android:topRightRadius="3dp" android:bottomLeftRadius="3dp" android:bottomRightRadius="3dp" />-->
-  </shape>
- </item>
- <item>
-  <shape android:shape="rectangle">
-   <padding
-    android:bottom="2dp" android:left="2dp" android:top="2dp" android:right="2dp"/>
-   <solid android:color="#20CCCCCC" />
-   <corners android:radius="8dp" />
-<!--   <corners android:topLeftRadius="3dp" android:topRightRadius="3dp" android:bottomLeftRadius="3dp" android:bottomRightRadius="3dp" />-->
-  </shape>
- </item>
- <item>
-  <shape android:shape="rectangle">
-   <padding
-    android:bottom="2dp" android:left="2dp" android:top="2dp" android:right="2dp"/>
-   <solid android:color="#30CCCCCC" />
-   <corners android:radius="8dp" />
-<!--   <corners android:topLeftRadius="3dp" android:topRightRadius="3dp" android:bottomLeftRadius="3dp" android:bottomRightRadius="3dp" />-->
-  </shape>
- </item> 
- <!-- 中心背景 -->
- <item>
-  <shape android:shape="rectangle"
-   android:useLevel="false">
-   <!-- 实心 -->
-   <solid android:color="#ffffff" />
-   <corners android:radius="8dp" />
-<!--   <corners android:topLeftRadius="3dp" android:topRightRadius="3dp" android:bottomLeftRadius="3dp" android:bottomRightRadius="3dp" />-->
-   <padding 
-    android:bottom="2dp" android:left="2dp" android:top="2dp" android:right="2dp"/>
-  </shape>
- </item>
+    <!-- 边 -->
+    <item>
+        <shape android:shape="rectangle">
+            <!--   <padding-->
+            <!--    android:bottom="2dp" android:left="2dp" android:top="2dp" android:right="2dp"/>-->
+            <!--   <solid android:color="#00CCCCCC" />-->
+            <corners android:radius="8dp" />
+            <!--   <corners android:topLeftRadius="3dp" android:topRightRadius="3dp" android:bottomLeftRadius="3dp" android:bottomRightRadius="3dp" />-->
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <!--   <padding-->
+            <!--    android:bottom="2dp" android:left="2dp" android:top="2dp" android:right="2dp" />-->
+            <!--   <solid android:color="#10CCCCCC" />-->
+            <corners android:radius="8dp" />
+            <!--   <corners android:topLeftRadius="3dp" android:topRightRadius="3dp" android:bottomLeftRadius="3dp" android:bottomRightRadius="3dp" />-->
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <!--   <padding-->
+            <!--    android:bottom="2dp" android:left="2dp" android:top="2dp" android:right="2dp"/>-->
+            <!--   <solid android:color="#20CCCCCC" />-->
+            <!--   <corners android:radius="8dp" />-->
+            <!--   <corners android:topLeftRadius="3dp" android:topRightRadius="3dp" android:bottomLeftRadius="3dp" android:bottomRightRadius="3dp" />-->
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="2dp"
+                android:left="2dp"
+                android:right="2dp"
+                android:top="2dp" />
+            <solid android:color="#30CCCCCC" />
+            <corners android:radius="8dp" />
+        </shape>
+    </item>
+    <!-- 中心背景 -->
+    <item>
+        <shape
+            android:shape="rectangle"
+            android:useLevel="false">
+            <!-- 实心 -->
+            <solid android:color="#ffffff" />
+            <corners android:radius="8dp" />
+            <!--   <corners android:topLeftRadius="3dp" android:topRightRadius="3dp" android:bottomLeftRadius="3dp" android:bottomRightRadius="3dp" />-->
+            <padding
+                android:bottom="2dp"
+                android:left="2dp"
+                android:right="2dp"
+                android:top="2dp" />
+        </shape>
+    </item>
 </layer-list>

YHYXSDK/res/layout/sf_red_envelope_list.xml

@@ -60,32 +60,32 @@
             android:layout_height="match_parent"
             android:orientation="vertical">
 
-            <RelativeLayout
-                android:id="@+id/no_use_red_bar"
-                android:layout_width="match_parent"
-                android:layout_height="60dp"
-                android:layout_marginBottom="7dp"
-                android:background="@drawable/sf_red_envelope_bg"
-                android:paddingLeft="15dp"
-                android:paddingRight="15dp"
-                android:visibility="gone">
+<!--            <RelativeLayout-->
+<!--                android:id="@+id/no_use_red_bar"-->
+<!--                android:layout_width="match_parent"-->
+<!--                android:layout_height="60dp"-->
+<!--                android:layout_marginBottom="7dp"-->
+<!--                android:background="@drawable/sf_red_envelope_bg"-->
+<!--                android:paddingLeft="15dp"-->
+<!--                android:paddingRight="15dp"-->
+<!--                android:visibility="gone">-->
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:text="@string/sf_no_red_envelope"
-                    android:textColor="@color/sf_input_text_color"
-                    android:textSize="16sp" />
+<!--                <TextView-->
+<!--                    android:layout_width="wrap_content"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:layout_centerVertical="true"-->
+<!--                    android:text="@string/sf_no_red_envelope"-->
+<!--                    android:textColor="@color/sf_input_text_color"-->
+<!--                    android:textSize="16sp" />-->
 
-                <ImageView
-                    android:id="@+id/selector"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-                    android:src="@drawable/sf_pay_type_selected" />
-            </RelativeLayout>
+<!--                <ImageView-->
+<!--                    android:id="@+id/selector"-->
+<!--                    android:layout_width="30dp"-->
+<!--                    android:layout_height="30dp"-->
+<!--                    android:layout_alignParentRight="true"-->
+<!--                    android:layout_centerVertical="true"-->
+<!--                    android:src="@drawable/sf_pay_type_selected" />-->
+<!--            </RelativeLayout>-->
 
             <LinearLayout
                 android:id="@+id/red_envelope_list_bar"

YHYXSDK/res/layout/snowfish_bind_state.xml

@@ -107,7 +107,7 @@
                 android:gravity="center"
                 android:text="@string/sf_phone_verify_tip"
                 android:textColor="@color/gray_8888"
-                android:textSize="14sp" />
+                android:textSize="20sp" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -159,7 +159,7 @@
                 android:text="@string/sf_phone_verify_tip"
                 android:gravity="center"
                 android:textColor="@color/gray_8888"
-                android:textSize="14sp" />
+                android:textSize="20sp" />
         </RelativeLayout>
     </LinearLayout>
 </LinearLayout>

YHYXSDK/res/layout/snowfish_pay_record.xml

@@ -44,7 +44,8 @@
         android:id="@+id/pay_list"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:divider="@null"
+        android:divider="@android:color/transparent"
+        android:dividerHeight="6dp"
         android:paddingLeft="15dp"
         android:paddingRight="15dp"
         android:scrollbars="none"/>

YHYXSDK/res/layout/snowfish_usercenter1.xml

@@ -249,13 +249,6 @@
                             android:textColor="@color/gray_8888"
                             android:textSize="13sp" />
                     </RelativeLayout>
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1px"
-                        android:layout_marginLeft="15dp"
-                        android:layout_marginRight="15dp"
-                        android:background="#80CCCCCC" />
                     <!-- 绑定邮箱 -->
                     <include layout="@layout/include_line" />
 

YHYXSDK/res/layout/yh_pay_item.xml

@@ -1,73 +1,75 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="15dp"
-    android:layout_marginTop="6dp"
-    android:layout_marginBottom="6dp"
-    android:background="@drawable/yh_float_model_shape" >
+    android:layout_height="wrap_content">
 
-    <ImageView
-        android:id="@+id/app_icon"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_alignParentLeft="true"
-        android:layout_centerVertical="true"
-        android:src="@drawable/hotspot" />
-
-    <TextView
-        android:id="@+id/app_name"
-        android:layout_width="wrap_content"
+    <RelativeLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="6dp"
-        android:layout_toRightOf="@+id/app_icon"
-        android:textColor="#000000"
-        android:text="AppName"
-        android:textSize="14sp" />
+        android:background="@drawable/yh_float_model_shape"
+        android:padding="15dp">
 
-    <TextView
-        android:id="@+id/pay_time"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/app_name"
-        android:layout_below="@+id/pay_trade"
-        android:layout_marginTop="6dp"
-        android:maxEms="16"
-        android:singleLine="true"
-        android:text="pay_time"
-        android:textColor="#808080"
-        android:textSize="12sp" />
+        <ImageView
+            android:id="@+id/app_icon"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_alignParentLeft="true"
+            android:layout_centerVertical="true"
+            android:src="@drawable/hotspot" />
 
-    <TextView
-        android:id="@+id/pay_trade"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/app_name"
-        android:layout_below="@+id/app_name"
-        android:layout_marginTop="2dp"
-        android:text="@string/sf_pay_trade"
-        android:textColor="#808080"
-        android:textSize="12sp"
-        android:visibility="gone" />
+        <TextView
+            android:id="@+id/app_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="6dp"
+            android:layout_toRightOf="@+id/app_icon"
+            android:text="AppName"
+            android:textColor="#000000"
+            android:textSize="14sp" />
 
-    <TextView
-        android:id="@+id/pay_amount"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:textColor="@color/sf_black_color"
-        android:text="0"
-        android:textSize="14sp" />
+        <TextView
+            android:id="@+id/pay_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/pay_trade"
+            android:layout_alignLeft="@+id/app_name"
+            android:layout_marginTop="6dp"
+            android:maxEms="16"
+            android:singleLine="true"
+            android:text="pay_time"
+            android:textColor="#808080"
+            android:textSize="12sp" />
 
-    <TextView
-        android:id="@+id/pay_result"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_marginTop="6dp"
-        android:layout_below="@+id/pay_amount"
-        android:text="@string/sf_pay_success"
-        android:textColor="@color/gray_8888"
-        android:textSize="12sp" />
+        <TextView
+            android:id="@+id/pay_trade"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/app_name"
+            android:layout_alignLeft="@+id/app_name"
+            android:layout_marginTop="2dp"
+            android:text="@string/sf_pay_trade"
+            android:textColor="#808080"
+            android:textSize="12sp"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/pay_amount"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:text="0"
+            android:textColor="@color/sf_black_color"
+            android:textSize="14sp" />
 
-</RelativeLayout>
+        <TextView
+            android:id="@+id/pay_result"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/pay_amount"
+            android:layout_alignParentRight="true"
+            android:layout_marginTop="6dp"
+            android:text="@string/sf_pay_success"
+            android:textColor="@color/gray_8888"
+            android:textSize="12sp" />
+    </RelativeLayout>
+</LinearLayout>

YHYXSDK/res/layout/yh_pay_layout.xml

@@ -145,6 +145,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/yh_order_bar"
+                android:layout_marginTop="10dp"
                 android:background="@drawable/yh_float_model_shape"
                 android:gravity="center"
                 android:orientation="horizontal">

YHYXSDK/src/com/sdk/pay/activity/PriceGridAdapter.java

@@ -54,11 +54,11 @@ public class PriceGridAdapter extends BaseAdapter {
 				tempText = ResourceUtils.getString(activity, "sf_offer_price")+(priceMap[position]*OrderInfo.getPayRate()/100.0)+"元";
 			}
 			price.setText(tempText);
-			if(position == 0) {
-				priceView.setBackgroundResource(ResourceUtils.getDrawableId(activity, "yh_select"));
-			} else {
-				priceView.setBackgroundResource(ResourceUtils.getDrawableId(activity, "yh_unselect"));
-			}
+//			if(position == 0) {
+//				priceView.setBackgroundResource(ResourceUtils.getDrawableId(activity, "yh_select"));
+//			} else {
+//				priceView.setBackgroundResource(ResourceUtils.getDrawableId(activity, "yh_unselect"));
+//			}
 			return priceView;
 		} else {
 			view.setLayoutParams(new AbsListView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,  

YHYXSDK/src/com/sdk/pay/activity/YijiePayActivity.java

@@ -18,6 +18,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.alibaba.fastjson.JSONObject;
 import com.sdk.base.BaseActivity;
 import com.sdk.base.OrderInfo;
 import com.sdk.helper.YJInfoListener;
@@ -31,8 +32,10 @@ import com.sdk.protocol.PayInfoIml;
 import com.sdk.usercenter.SFUserCenter;
 import com.sdk.usercenter.info.RedPacketInfo;
 import com.sdk.utils.IUtils;
+import com.sdk.utils.LogHelper;
 import com.sdk.utils.NoDoubleClickListener;
 import com.sdk.utils.ResourceUtils;
+import com.snowfish.Fight2Death.app1.R;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -41,7 +44,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 
 /**
- * 收银台
+ * 收银台  activity
  */
 public class YijiePayActivity extends BaseActivity {
 
@@ -53,9 +56,9 @@ public class YijiePayActivity extends BaseActivity {
 	private ImageView alipayAppSelect;
 	private ImageView wxWebSelect;
 	private ImageView wxAppSelect;
-	private ImageView redEnvelopeIcon;
+//	private ImageView redEnvelopeIcon;
 
-	private RelativeLayout redEnvelope;
+//	private RelativeLayout redEnvelope;
 
 	// private TextView currencyView;
 	private TextView walletView;
@@ -144,7 +147,7 @@ public class YijiePayActivity extends BaseActivity {
 		});
 		LinearLayout redEnvelopeBar = (LinearLayout) findViewById(getResourceId("red_envelope_bar"));
 		redEnvelopeCount = (TextView) ResourceUtils.findViewByName(this, view, "red_enter_info");
-		redEnvelope = (RelativeLayout) ResourceUtils.findViewByName(this, view, "red_enter_bar");
+//		redEnvelope = (RelativeLayout) ResourceUtils.findViewByName(this, view, "red_enter_bar");
 		if (OrderInfo.getAvairedEnvelopeCount() != 0) {
 			String redenvelope = String.format(ResourceUtils.getString(this, "sf_red_envelope_info"),
 					OrderInfo.getAvairedEnvelopeCount());
@@ -178,18 +181,16 @@ public class YijiePayActivity extends BaseActivity {
 				+ (OrderInfo.getTotalFee() - OrderInfo.getActualPay()) / 100.0;
 
 		offerView.setText(tempText);
-
+		//支付按钮
 		Button payBtn = (Button) view.findViewById(getResourceId("pay_button"));
 		payBtn.setOnClickListener(new NoDoubleClickListener() {
 
 			@Override
 			public void onNoDoubleClick(View arg0) {
-
 				if (OrderInfo.getActualPay() == 0) {
 					selectPayType = PayType.CURRENCY_PAY;
 				}
 //				Toast.makeText(YijiePayActivity.this, "余额不足", Toast.LENGTH_SHORT).show();
-
 				SFPayInterface.instance().pay(YijiePayActivity.this, selectPayType, new YJPayListener() {
 
 					@Override
@@ -378,6 +379,7 @@ public class YijiePayActivity extends BaseActivity {
 			}
 		});
 		mUseRedEnvelopeConfirmButton = (TextView) view.findViewById(getResourceId("confirm_button"));
+		// 代金券列表 确定
 		mUseRedEnvelopeConfirmButton.setOnClickListener(new NoDoubleClickListener() {
 
 			@Override
@@ -392,7 +394,8 @@ public class YijiePayActivity extends BaseActivity {
 		});
 		mSelectRedInfoArr.clear();
 		mSelectButtonMap.clear();
-		for (RedPacketInfo info : PayInfoIml.instance().redPayData) {
+		for (RedPacketInfo info : PayInfoIml.instance().redPayData) { //循环添加 可用代金券列表item
+			LogHelper.log("RedPacketInfo"+ JSONObject.toJSONString(info));
 			addRedEnvelopeList(redEnvelopeBar, info);
 		}
 		dialog.setContentView(view);
@@ -411,7 +414,6 @@ public class YijiePayActivity extends BaseActivity {
 		View view = null;
 		if (info.getUseFlag() == RedPacketInfo.AVAILABLE_STATE) {
 			view = View.inflate(this, ResourceUtils.getLayoutId(this, "yh_available_red_list_item"), null);
-
 			TextView amount = (TextView) ResourceUtils.findViewByName(this, view, "red_amount");
 			BigDecimal redAmountB;
 			BigDecimal dv;
@@ -517,33 +519,37 @@ public class YijiePayActivity extends BaseActivity {
 
 	}
 
+	/**
+	 * 使用代金券
+	 */
 	private void useRedEnvelope() {
 		PayInfoIml.instance().SecletRedgetPayInfo(YijiePayActivity.this, new YJInfoListener() {
 
 			@Override
 			public void onCallBack(int code, String msg) {
-				if (code == YJResultData.REQUST_SUCCESS) {
-					long redPay = OrderInfo.getCurrencyPay();
+				LogHelper.log("RedEnvelope" + msg);
+				if (code == YJResultData.REQUST_SUCCESS) {  //使用代金券回调结果
+					long redPay = OrderInfo.getCurrencyPay();//平台币支付金额
 					if (redPay <= 0) {
-						if (OrderInfo.getAvairedEnvelopeCount() != 0) {
-							redEnvelope.setBackgroundColor(Color.parseColor("#ea5148"));
-							redEnvelopeIcon.setVisibility(View.VISIBLE);
-							redEnvelopeCount.setTextColor(Color.parseColor("#ffffff"));
+						if (OrderInfo.getAvairedEnvelopeCount() != 0) { //支付可用红包数量
+//							redEnvelope.setBackgroundColor(Color.parseColor("#ea5148"));
+//							redEnvelopeIcon.setVisibility(View.VISIBLE);
+							redEnvelopeCount.setTextColor(Color.parseColor("#8a8a8a"));
 							redEnvelopeCount.setTextSize(TypedValue.COMPLEX_UNIT_SP, 12); // 设置12SP
 							String redenvelope = String.format(
 									ResourceUtils.getString(YijiePayActivity.this, "sf_red_envelope_info"),
 									OrderInfo.getAvairedEnvelopeCount());
 							redEnvelopeCount.setText(redenvelope);
 						} else {
-							redEnvelope.setBackgroundColor(Color.parseColor("#ffffff"));
-							redEnvelopeIcon.setVisibility(View.GONE);
+//							redEnvelope.setBackgroundColor(Color.parseColor("#ffffff"));
+//							redEnvelopeIcon.setVisibility(View.GONE);
 							redEnvelopeCount.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14); // 设置14SP
 							redEnvelopeCount.setTextColor(Color.parseColor("#8a8a8a"));
 							redEnvelopeCount.setText(ResourceUtils.getString(YijiePayActivity.this, "sf_null"));
 						}
 					} else {
-						redEnvelope.setBackgroundColor(Color.parseColor("#ffffff"));
-						redEnvelopeIcon.setVisibility(View.GONE);
+//						redEnvelope.setBackgroundColor(Color.parseColor("#ffffff"));
+//						redEnvelopeIcon.setVisibility(View.GONE);
 						redEnvelopeCount.setTextColor(Color.parseColor("#FFC93437"));
 						redEnvelopeCount.setText("-¥" + redPay / 100.0);
 						redEnvelopeCount.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16); // 设置16SP
@@ -568,6 +574,17 @@ public class YijiePayActivity extends BaseActivity {
 					if (actualPay == 0) {
 						selectPayType = PayType.CURRENCY_PAY;
 					}
+					//这个显示使用的代金券吧
+					if (mSelectRedInfoArr.size()<1){
+						redEnvelopeCount.setTextColor(Color.parseColor("#8a8a8a"));
+					}else if (mSelectRedInfoArr.size()==1){
+						redEnvelopeCount.setTextColor(getResources().getColor(R.color.sf_black_color));
+						redEnvelopeCount.setText(mSelectRedInfoArr.get(0).getRedAmount() / 100.0+"元代金券");
+					}else if (mSelectRedInfoArr.size()>1){
+						redEnvelopeCount.setTextColor(getResources().getColor(R.color.sf_black_color));
+						redEnvelopeCount.setText(mSelectRedInfoArr.get(0).getRedAmount() / 100.0+"元代金券...");
+					}
+
 				} else {
 					payListner.payFail(YJResultData.GET_PAY_INFO_FAIL, msg);
 					finish();

YHYXSDK/src/com/sdk/pay/activity/YijieRechargeCurrencyActivity.java

@@ -39,6 +39,9 @@ import com.sdk.utils.ResourceUtils;
 
 import java.text.SimpleDateFormat;
 
+/**
+ * 充值钱包 activity
+ */
 public class YijieRechargeCurrencyActivity extends Activity {
 	
 	private int selectPayType = 0;

YHYXSDK/src/com/sdk/protocol/PayInfoIml.java

@@ -142,7 +142,9 @@ public class PayInfoIml {
 										isusecount++;
 									}
 								}
+
 								OrderInfo.setAvairedEnvelopeCount(isusecount);
+								LogHelper.log("getPayParams: #paytype=" + com.alibaba.fastjson.JSONObject.toJSONString(redPayData));
 								LogHelper.log("getPayParams: #paytype=" + paytype + " #payparams=" + payparams
 										+ " #currencyInfo=" + currinfo + " #ActualPay=" + OrderInfo.getActualPay()
 										+ " #CurrencyPay=" + OrderInfo.getCurrencyPay() + " #WalletPay="
@@ -178,7 +180,6 @@ public class PayInfoIml {
 								OrderInfo.setActualPay(r.readU32());
 								OrderInfo.setCurrencyPay(r.readU32());
 								OrderInfo.setWalletPay(r.readU32());
-
 								LogHelper.log("getPayParams: " + " #ActualPay=" + OrderInfo.getActualPay()
 										+ " #CurrencyPay=" + OrderInfo.getCurrencyPay() + " #WalletPay="
 										+ OrderInfo.getWalletPay() + " #WalletBalance=" + OrderInfo.getWalletBalance()

YHYXSDK/src/com/sdk/usercenter/activity/AccountBindStateActivity.java

@@ -65,7 +65,7 @@ public class AccountBindStateActivity extends Activity {
 			phoneVerifyTxt.setHintTextColor(android.R.color.transparent);
 		} else {
 			phoneVerifyTxt.setText(IUtils.setPhone(phone));
-			phoneVerifyTxt.setTextSize(20);
+//			phoneVerifyTxt.setTextSize(20);
 			viaphone.setVisibility(View.VISIBLE);
 			viaphone.setOnClickListener(new NoDoubleClickListener() {
 
@@ -87,7 +87,7 @@ public class AccountBindStateActivity extends Activity {
 			emailVerifyTxt.setHintTextColor(android.R.color.transparent);
 		} else {
 			emailVerifyTxt.setText(IUtils.setEmail(email));
-			phoneVerifyTxt.setTextSize(20);
+//			phoneVerifyTxt.setTextSize(20);
 			viaemail.setVisibility(View.VISIBLE);
 			viaemail.setOnClickListener(new NoDoubleClickListener() {
 

YHYXSDK/src/com/sdk/utils/ComReq.java

@@ -1,13 +1,13 @@
 package com.sdk.utils;
 
-import java.util.ArrayList;
+import android.content.Context;
 
 import com.sdk.http.SFCommonHttpRequest;
 import com.sdk.protocol.BaseInfoChunkBuilder;
 import com.sdk.protocol.DeviceInfoChunkBuilder;
 import com.sdk.protocol.OrderInfoChunkBuilder;
 
-import android.content.Context;
+import java.util.ArrayList;
 
 public class ComReq {
 	
@@ -53,7 +53,7 @@ public class ComReq {
 	
 	public void request(final Context context, int type, boolean multi, IPW w, int reqChunkType,
 			int respChunkType, IHttpListener listener) {
-		
+		LogHelper.log("request"+ w.toString());
 		PacketWriter pw = new PacketWriter();
 		pw.write(w.toByteArray());
 		

YHYXSdkDemo/build.gradle

@@ -66,7 +66,7 @@ android {
     dependencies {
 //        api fileTree(dir: 'libs', include: ['*.jar'])
         api project(':YHYXSDK')
-        compileOnly project(':YHYXSdkLib')
+//        compileOnly project(':YHYXSdkLib')
         implementation 'com.android.support:multidex:1.0.3'
 //        testImplementation 'junit:junit:4.13.2'
     }

YHYXSdkDemo/src/com/example/yjsdkdemo/MainActivity.java

@@ -98,7 +98,6 @@ public class MainActivity extends Activity implements View.OnClickListener {
 		}
 	};
 	YJLoginListener loginListener = new YJLoginListener() {
-
 		@Override
 		public void logoutSuccess() {
 			Log.e(TAG, "登出成功");