Merge remote-tracking branch 'origin/xhz_uiupdate' into xhz_uiupdate

app/build.gradle

@@ -15,7 +15,7 @@ android {
         applicationId "com.smileflowpig.money"
         minSdkVersion 19
         targetSdkVersion 28
-        versionCode 9
+        versionCode 10
         versionName "2.0.0"
         multiDexEnabled true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

app/src/main/AndroidManifest.xml

@@ -28,6 +28,7 @@
         android:largeHeap="true"
         android:roundIcon="@mipmap/ic_flowpig"
         android:supportsRtl="true"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:theme="@style/AppTheme">
         <meta-data
             android:name="design_width"

app/src/main/java/com/smileflowpig/money/moneyplatfrom/LampView.java

@@ -43,13 +43,12 @@ public class LampView extends FrameLayout {
     private void setView() {  
         inflate(getContext(), R.layout.lamp_layout, this);  
         ButterKnife.bind(this, this);
-
-    }  
+    }
   
     private void initView() {
 
         lampView.setData((ArrayList<Notice>) list);
-        lampView.setTextSize(15);
+        lampView.setTextSize(14);
         lampView.setTimer(3000);
         lampView.start();
 

app/src/main/java/com/smileflowpig/money/moneyplatfrom/frags/main/state/PigHomeFragment.java

@@ -163,7 +163,6 @@ public class PigHomeFragment extends PresenterFragment implements View.OnClickLi
         //获取当前渠道号
         String channelId = Network.channelId;
         changid = Integer.parseInt(channelId);
-        cardvisible();
         list = new ArrayList<>();
         for (int i = 0; i < 6; i++) {
             list.add("");

app/src/main/java/com/smileflowpig/money/moneyplatfrom/web/WebActivity.java

@@ -204,6 +204,7 @@ public class WebActivity extends PresenterActivity<WebContract.Presenter>
         webview.setWebChromeClient(new MyWebChromeClient());
         webview.addJavascriptInterface(new AndroidtoJs(), "native");//AndroidtoJS类对象映射到js的test对象
         webview.loadUrl(url);
+//        webview.loadUrl(" https://m-stg2.tianxiaxinyong.com/cooperation/b-test.html");
 
 
         if (isPop) {
@@ -470,16 +471,15 @@ public class WebActivity extends PresenterActivity<WebContract.Presenter>
             return super.shouldOverrideUrlLoading(view, url);
         }
 
-        @Override
-        public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                view.loadUrl(request.getUrl().toString());
-            } else {
-                view.loadUrl(request.toString());
-            }
-            return true;
-
-        }
+//        @Override
+//        public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
+//            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+//                view.loadUrl(request.getUrl().toString());
+//            } else {
+//                view.loadUrl(request.toString());
+//            }
+//            return true;
+//        }
 
         @Override
         public void onPageStarted(WebView view, String url, Bitmap favicon) {
@@ -657,6 +657,7 @@ public class WebActivity extends PresenterActivity<WebContract.Presenter>
 
         //
         // For Android > 5.0支持多张上传
+        @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
         @Override
         public boolean onShowFileChooser(WebView webView, ValueCallback<Uri[]> uploadMsg,
                                          FileChooserParams fileChooserParams) {

app/src/main/res/layout/lamp_layout.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.zhy.autolayout.AutoLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
     android:orientation="horizontal">
@@ -17,7 +17,7 @@
 
     <com.smileflowpig.money.moneyplatfrom.helper.VerticalLampView
         android:id="@+id/lamp_view"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="@dimen/len_24"
         android:layout_marginLeft="@dimen/len_8"
         android:layout_gravity="center_vertical"

app/src/main/res/layout/pighome_layout.xml

@@ -42,6 +42,7 @@
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:layout_marginRight="20px"
+                    android:visibility="visible"
                     android:src="@mipmap/havemessage" />
             </RelativeLayout>
         </LinearLayout>
@@ -50,16 +51,12 @@
             android:id="@+id/home_scroll"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:fadingEdge="none"
-            android:fillViewport="true"
-            android:overScrollMode="never">
+          >
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@color/white"
-                android:clipChildren="false"
-                android:gravity="center_horizontal"
                 android:orientation="vertical">
 
                 <LinearLayout
@@ -91,6 +88,7 @@
 
                         <ImageView
                             android:id="@+id/pighomemess"
+                            android:visibility="visible"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_alignParentRight="true"
@@ -117,18 +115,18 @@
 
                         <ImageView
                             android:id="@+id/onedata_img"
-                            android:layout_centerHorizontal="true"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:src="@mipmap/qucklist"/>
+                            android:layout_centerHorizontal="true"
+                            android:src="@mipmap/qucklist" />
 
                         <TextView
                             android:id="@+id/titleone"
-                            android:layout_marginTop="5px"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_below="@+id/onedata_img"
                             android:layout_centerHorizontal="true"
+                            android:layout_marginTop="5px"
                             android:gravity="center"
                             android:singleLine="true"
                             android:textColor="@color/text_black"
@@ -157,20 +155,21 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1.2"
                             android:orientation="vertical">
+
                             <ImageView
                                 android:id="@+id/twodata_img"
-                                android:layout_centerHorizontal="true"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:src="@mipmap/qucknews"/>
+                                android:layout_centerHorizontal="true"
+                                android:src="@mipmap/qucknews" />
 
                             <TextView
                                 android:id="@+id/titletwo"
-                                android:layout_marginTop="5px"
-                                android:layout_below="@+id/twodata_img"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:layout_below="@+id/twodata_img"
                                 android:layout_centerInParent="true"
+                                android:layout_marginTop="5px"
                                 android:gravity="center"
                                 android:singleLine="true"
                                 android:textColor="@color/text_black"
@@ -191,17 +190,18 @@
 
                             <ImageView
                                 android:id="@+id/threedata_img"
-                                android:layout_centerHorizontal="true"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:src="@mipmap/qucksuccess"/>
+                                android:layout_centerHorizontal="true"
+                                android:src="@mipmap/qucksuccess" />
+
                             <TextView
                                 android:id="@+id/titlethree"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:layout_below="@+id/threedata_img"
                                 android:layout_centerInParent="true"
                                 android:layout_marginTop="5px"
-                                android:layout_below="@+id/threedata_img"
                                 android:gravity="center"
                                 android:singleLine="true"
                                 android:textColor="@color/text_black"
@@ -228,17 +228,18 @@
 
                         <ImageView
                             android:id="@+id/fourdata_img"
-                            android:layout_centerHorizontal="true"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:src="@mipmap/quckcard"/>
+                            android:layout_centerHorizontal="true"
+                            android:src="@mipmap/quckcard" />
+
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:layout_below="@+id/fourdata_img"
                             android:layout_centerHorizontal="true"
                             android:layout_centerVertical="true"
                             android:layout_marginTop="5px"
-                            android:layout_below="@+id/fourdata_img"
                             android:gravity="center"
                             android:text="信用卡"
                             android:textColor="@color/text_black"
@@ -248,30 +249,33 @@
 
                 </RelativeLayout>
 
-
-                <com.smileflowpig.money.moneyplatfrom.util.CustomViewpagerView
-                    android:id="@+id/pigvp"
+                <RelativeLayout
                     android:layout_width="match_parent"
-                    android:layout_height="174px"
-                    android:layout_marginLeft="30px"
-                    android:layout_marginTop="8px"
-                    android:layout_marginRight="30px"
-                    android:clipChildren="false" />
+                    android:layout_height="wrap_content"
+                    android:clipChildren="false">
+
+                    <com.smileflowpig.money.moneyplatfrom.util.CustomViewpagerView
+                        android:id="@+id/pigvp"
+                        android:layout_width="match_parent"
+                        android:layout_height="174px"
+                        android:layout_marginLeft="30px"
+                        android:layout_marginTop="8px"
+                        android:layout_marginRight="30px"
+                        android:clipChildren="false" />
+                </RelativeLayout>
 
 
                 <LinearLayout
-                    android:layout_width="wrap_content"
+                    android:layout_width="340px"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="40px"
+                    android:layout_gravity="center_horizontal"
                     android:layout_marginTop="10px"
                     android:layout_marginBottom="10px"
-                    android:gravity="center"
                     android:orientation="horizontal">
 
                     <ImageView
                         android:layout_width="wrap_content"
-                        android:layout_height="18dp"
-                        android:scaleType="fitXY"
+                        android:layout_height="wrap_content"
                         android:src="@mipmap/xiaohuazhu" />
 
                     <View
@@ -285,13 +289,14 @@
 
                     <com.smileflowpig.money.moneyplatfrom.LampView
                         android:id="@+id/piglampview"
-
                         android:layout_width="wrap_content"
+                        android:visibility="visible"
                         android:layout_height="match_parent" />
                 </LinearLayout>
 
                 <com.stx.xhb.xbanner.XBanner
                     android:id="@+id/pigbanner"
+                    android:layout_gravity="center_horizontal"
                     android:layout_width="355px"
                     android:layout_height="108px"
                     app:AutoPlayTime="3000"
@@ -351,7 +356,6 @@
                             android:id="@+id/pig_home_hotplat_img"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
-
                             android:scaleType="fitXY"
                             android:src="@mipmap/hot_platform" />
                     </RelativeLayout>

app/src/main/res/xml/network_security_config.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true" />
+</network-security-config>

common/src/main/res/layout/item_lamp_layout.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content" >
 
 
     <TextView
         android:id="@+id/tv_info"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
         android:ellipsize="end"