merge userinfo

app/build.gradle

@@ -1,5 +1,3 @@
-
-
 apply plugin: 'com.android.application'
 android {
     signingConfigs {
@@ -17,7 +15,7 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         signingConfig signingConfigs.config
         multiDexEnabled true
     }
@@ -46,41 +44,42 @@ android {
 dependencies {
     implementation project(':flutter')
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:multidex:1.0.3'
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    implementation 'androidx.multidex:multidex:2.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    androidTestImplementation 'androidx.test:runner:1.1.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
     //系统全局配置模块
     implementation 'com.bristua.framework:appconfig:2.0.0-SNAPHOST'
     implementation 'com.bristua.framework:component_manager:2.0.0-SNAPHOST'
     //https模块
     implementation 'com.bristua.framework:https:2.0.1-SNAPHOST'
     //路由模块
+
     implementation 'com.bristua.framework:brouter:2.0.0-SNAPHOST'
     //配置通用api 能力
     implementation 'com.bristua.framework:common_api:2.0.0-SNAPHOST'
     //配置shareprefense
     implementation 'com.bristua.framework:sp_manager:1.0.4-SNAPHOST'
     //全局APP Context
     implementation 'com.bristua.framework:context:2.0.0-SNAPHOST'
-    implementation 'com.ft.business.interceptor:response:1.1.2-SNAPHOST'
-    implementation 'com.ft.business.component:user_login:6.1.1-SNAPHOST'
+    implementation 'com.ft.business.interceptor:response:1.2.2-SNAPHOST'
+    implementation 'com.ft.business.component:user_login:6.1.4-SNAPHOST'
     implementation 'com.ft.business.component:invite:1.0.0-SNAPHOST'
     implementation 'com.ft.business.component:user_pay:1.1.2-SNAPHOST'
     implementation 'com.ft.business.component:enviroment:1.0.8-SNAPHOST'
-    implementation 'com.ft.business.component:shop_cart:1.2.6-SNAPHOST'
-    implementation 'com.ft.business.component:shop_sku:1.0.5-SNAPHOST'
-    implementation 'com.ft.business.component:address:1.1.1-SNAPHOST'
-    implementation 'com.ft.business.component:order:1.0.9-SNAPHOST'
-    implementation 'com.ft.business.component:order_list:1.0.0-SNAPHOST'
+    implementation 'com.ft.business.component:shop_cart:1.4.6-SNAPHOST'
+    implementation 'com.ft.business.component:shop_sku:1.0.6-SNAPHOST'
+    implementation 'com.ft.business.component:address:1.1.4-SNAPHOST'
+    implementation 'com.ft.business.component:order:1.3.4-SNAPHOST'
+    implementation 'com.ft.business.component:order_list:1.0.3-SNAPHOST'
     implementation 'com.ft.business.component:evaluate:1.0.1-SNAPHOST'
-    implementation 'com.ft.business.component:collection:1.0.1-SNAPHOST'
-    implementation 'com.ft.business.component:product:1.0.5-SNAPHOST'
-    implementation 'com.ft.business.component:rebate:1.0.8-SNAPHOST'
+    implementation 'com.ft.business.component:collection:1.0.2-SNAPHOST'
+    implementation 'com.ft.business.component:product:1.1.1-SNAPHOST'
+    implementation 'com.ft.business.component:rebate:1.0.9-SNAPHOST'
     implementation 'com.bristua.framework:logger:1.0.4-SNAPHOST'
     implementation 'com.bristua.framework:ssl_cert:1.0.5-SNAPHOST'
-    implementation 'com.ft.business.component:category:1.0.8-SNAPHOST'
+    implementation 'com.ft.business.component:category:1.0.9-SNAPHOST'
     implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:5.3.1'
     annotationProcessor 'com.nd.sdp.android.serviceloader:service-loader-compiler-app:1.0.9'
     implementation 'com.nd.sdp.android.serviceloader:service-loader:1.0.9'

app/src/androidTest/java/com/ym/flutter/ftshop/ExampleInstrumentedTest.java

@@ -1,8 +1,8 @@
 package com.ym.flutter.ftshop;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

app/src/main/AndroidManifest.xml

@@ -1,20 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.bristua.flutter.ftshop">
 
     <application
-        android:name="com.bristua.flutter.ftshop.AppApplication"
+        android:name=".AppApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <!--9.0问题-->
-        <uses-library android:name="org.apache.http.legacy" android:required="false" />
+        android:theme="@style/AppTheme"
+        >
+        <activity android:name=".WebActivity"></activity>
+        <!-- 9.0问题 -->
+        <uses-library
+            android:name="org.apache.http.legacy"
+            android:required="false" />
+
         <activity
-            android:name="com.bristua.flutter.ftshop.VideoActivity"
+            android:name=".VideoActivity"
             android:theme="@style/DarkAppTheme">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -26,17 +32,15 @@
                     android:host="video"
                     android:scheme="flutterhost" />
             </intent-filter>
-
         </activity>
-
-        <activity android:name="com.bristua.flutter.ftshop.MainActivity">
+        <activity android:name=".MainActivity"
+            android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
         <activity
             android:name=".wxapi.WXEntryActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -46,8 +50,7 @@
             android:name=".WXAwakenActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:exported="true"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
-        <!-- 微信支付回调 -->
+            android:theme="@android:style/Theme.Translucent.NoTitleBar" /> <!-- 微信支付回调 -->
         <activity
             android:name=".wxapi.WXPayEntryActivity"
             android:exported="true"

app/src/main/java/com/bristua/flutter/ftshop/AppApplication.java

@@ -1,6 +1,5 @@
 package com.bristua.flutter.ftshop;
-import android.app.Application;
-import android.support.multidex.MultiDexApplication;
+import androidx.multidex.MultiDexApplication;
 
 import com.bristua.flutter.ftshop.app.AppVMachine;
 import com.bristua.flutter.ftshop.exception.VMachineException;

app/src/main/java/com/bristua/flutter/ftshop/MainActivity.java

@@ -1,22 +1,15 @@
 package com.bristua.flutter.ftshop;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.util.Log;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
-import com.alibaba.fastjson.JSON;
 import com.bristua.flutter.ftshop.plugin.PluginDelegate;
 import com.bristua.flutter.ftshop.plugin.PluginProvider;
-import com.bristua.flutter.ftshop.wxapi.WXCode;
-import com.bristua.framework.define.IFlutterResult;
-import com.bristua.framework.router.BRouter;
-import com.bristua.ft.component.CategoryConstant;
-import com.bristua.ft.component.userlogin.UserLoginConstant;
-import com.bristua.ft.protocol.Protocol;
 
 import io.flutter.facade.Flutter;
 import io.flutter.view.FlutterView;

app/src/main/java/com/bristua/flutter/ftshop/VideoActivity.java

@@ -1,6 +1,6 @@
 package com.bristua.flutter.ftshop;
 
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 
 public class VideoActivity extends AppCompatActivity {

app/src/main/java/com/bristua/flutter/ftshop/WXAwakenActivity.java

@@ -2,7 +2,7 @@
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;

app/src/main/java/com/bristua/flutter/ftshop/WebActivity.java

@@ -0,0 +1,131 @@
+package com.bristua.flutter.ftshop;
+
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+import android.webkit.JsResult;
+import android.webkit.WebChromeClient;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.widget.LinearLayout;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+public class WebActivity extends AppCompatActivity {
+    WebView webView;
+    String url = "";
+    TextView titleView;
+    LinearLayout mLayout;
+    ProgressBar progressBar;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_web);
+        url = getIntent().getStringExtra("url");
+        Log.e("web", url);
+        mLayout = findViewById(R.id.mLayout);
+        titleView = findViewById(R.id.titleView);
+        progressBar =findViewById(R.id.progressBar);
+        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+        webView = new WebView(getApplicationContext());
+        webView.setLayoutParams(params);
+        mLayout.addView(webView);
+
+
+        //声明WebSettings子类
+        WebSettings webSettings = webView.getSettings();
+
+//如果访问的页面中要与Javascript交互，则webview必须设置支持Javascript
+        webSettings.setJavaScriptEnabled(true);
+// 若加载的 html 里有JS 在执行动画等操作，会造成资源浪费（CPU、电量）
+// 在 onStop 和 onResume 里分别把 setJavaScriptEnabled() 给设置成 false 和 true 即可
+
+
+//设置自适应屏幕，两者合用
+        webSettings.setUseWideViewPort(true); //将图片调整到适合webview的大小
+        webSettings.setLoadWithOverviewMode(true); // 缩放至屏幕的大小
+
+//缩放操作
+        webSettings.setSupportZoom(true); //支持缩放，默认为true。是下面那个的前提。
+        webSettings.setBuiltInZoomControls(true); //设置内置的缩放控件。若为false，则该WebView不可缩放
+        webSettings.setDisplayZoomControls(false); //隐藏原生的缩放控件
+
+//其他细节操作
+        webSettings.setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK); //关闭webview中缓存
+        webSettings.setAllowFileAccess(true); //设置可以访问文件
+        webSettings.setJavaScriptCanOpenWindowsAutomatically(true); //支持通过JS打开新窗口
+        webSettings.setLoadsImagesAutomatically(true); //支持自动加载图片
+        webSettings.setDefaultTextEncodingName("utf-8");//设置编码格式
+
+
+        webSettings.setCacheMode(WebSettings.LOAD_DEFAULT);//根据cache-control决定是否从网络上取数据。
+
+
+        webSettings.setDomStorageEnabled(true); // 开启 DOM storage API 功能
+        webSettings.setDatabaseEnabled(true);   //开启 database storage API 功能
+        webSettings.setAppCacheEnabled(true);//开启 Application Caches 功能
+
+        webView.setWebChromeClient(new WebChromeClient() {
+            @Override
+            public void onReceivedTitle(WebView view, String title) {
+                titleView.setText(title);
+            }
+
+            @Override
+            public void onProgressChanged(WebView view, int newProgress) {
+                if (newProgress < 100) {
+                    progressBar.setVisibility(View.VISIBLE);
+                    progressBar.setProgress(newProgress);
+                } else {
+                    progressBar.setVisibility(View.GONE);
+                }
+            }
+
+            @Override
+            public boolean onJsAlert(WebView view, String url, String message, final JsResult result) {
+                new AlertDialog.Builder(WebActivity.this)
+                        .setTitle("JsAlert")
+                        .setMessage(message)
+                        .setPositiveButton("OK", (dialog, which) -> result.confirm())
+                        .setCancelable(false)
+                        .show();
+                return true;
+            }
+
+            @Override
+            public boolean onJsConfirm(WebView view, String url, String message, final JsResult result) {
+                new AlertDialog.Builder(WebActivity.this)
+                        .setTitle("JsConfirm")
+                        .setMessage(message)
+                        .setPositiveButton("OK", (dialog, which) -> result.confirm())
+                        .setNegativeButton("Cancel", (dialog, which) -> result.cancel())
+                        .setCancelable(false)
+                        .show();
+// 返回布尔值：判断点击时确认还是取消
+// true表示点击了确认；false表示点击了取消；
+                return true;
+            }
+
+
+        });
+        webView.loadUrl(url);
+
+    }
+
+    @Override
+    protected void onDestroy() {
+        if (webView != null) {
+            webView.loadDataWithBaseURL(null, "", "text/html", "utf-8", null);
+            webView.clearHistory();
+
+            ((ViewGroup) webView.getParent()).removeView(webView);
+            webView.destroy();
+            webView = null;
+        }
+        super.onDestroy();
+    }
+}

app/src/main/java/com/bristua/flutter/ftshop/app/AppVMachine.java

@@ -1,9 +1,8 @@
 package com.bristua.flutter.ftshop.app;
 
-import android.app.Application;
 import android.content.Context;
 import android.os.Handler;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.bristua.bristua.sp.ShareprefenseImpl;
 import com.bristua.flutter.ftshop.R;

app/src/main/java/com/bristua/flutter/ftshop/exception/VMachineException.java

@@ -1,6 +1,6 @@
 package com.bristua.flutter.ftshop.exception;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 /**
  * 虚拟机异常