对接代理服务

app/build.gradle

@@ -264,10 +264,10 @@ dependencies {
     //    compile 'com.google.zxing:core:3.3.0'
     compile project(':ucrop')
     compile project(':kfzslibrary')
-    compile('com.arialyy.aria:aria-core:3.3.16') {
+    compile('com.arialyy.aria:aria-core:3.4') {
         exclude group: 'com.android.support'
     }
-    annotationProcessor 'com.arialyy.aria:aria-compiler:3.3.16'
+    annotationProcessor 'com.arialyy.aria:aria-compiler:3.4'
     compile 'com.sunfusheng:marqueeview:1.3.3'
     compile 'com.github.nanchen2251:CompressHelper:1.0.5'
     compile files('libs/alipaySdk-20170922.jar')

app/src/main/java/com/kfzs/duanduan/fragment/FgtPersonalCenter.java

@@ -26,6 +26,7 @@ import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.activity.PersonalCenterAct;
+import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
@@ -53,6 +54,8 @@ public class FgtPersonalCenter extends BaseCompatFragment {
     TextView sheepNumTv;
     @BindView(R.id.personalcenter_item_price_tv)
     TextView personalcenter_item_price_tv;
+    @BindView(R.id.proxy_service_layout)
+    View proxy_service_layout;
     Unbinder unbinder;
 
     private UserEntity userEntitys;
@@ -101,6 +104,8 @@ public class FgtPersonalCenter extends BaseCompatFragment {
                 .load(userEntitys.getAvatar()+"")
                 .apply(new RequestOptions().circleCrop().placeholder(R.drawable.icon))
                 .into(iconImgIv);
+        //设置是否显示代理服务
+        proxy_service_layout.setVisibility(BuildConfig.DEBUG || userEntitys.getIs_agent() == 1 ? View.VISIBLE : View.GONE);
     }
 
     @Override
@@ -133,7 +138,7 @@ public class FgtPersonalCenter extends BaseCompatFragment {
                 Jump2View.getInstance().goTaskList2View(getActivity(), null);
                 break;
             case R.id.proxy_service_layout://代理
-                G.showToast("敬请期待!");
+                Jump2View.getInstance().goWeb(getActivity(), "http://10.8.210.172:8080/#/", "代理服务");
                 break;
             case R.id.abourt_us_layout://关于我们
                 Jump2View.getInstance()

app/src/main/java/com/sheep/gamegroup/model/entity/UserEntity.java

@@ -59,6 +59,8 @@ public class UserEntity implements Serializable {
     private int newbie_task_status;
     @Column(name = "is_new")
     private int is_new;//1新用户 2老用户
+    @Column(name = "is_agent")
+    private int is_agent;//0不是代理 1是代理
 
     public String getWx_nickname() {
         return wx_nickname;
@@ -228,9 +230,9 @@ public class UserEntity implements Serializable {
         this.share_link = share_link;
     }
 
-//    public int getNewbie_task_status() {
-//        return newbie_task_status;
-//    }
+    public int getNewbie_task_status() {
+        return newbie_task_status;
+    }
 
     public void setNewbie_task_status(int newbie_task_status) {
         this.newbie_task_status = newbie_task_status;
@@ -243,4 +245,12 @@ public class UserEntity implements Serializable {
     public void setIs_new(int is_new) {
         this.is_new = is_new;
     }
+
+    public int getIs_agent() {
+        return is_agent;
+    }
+
+    public void setIs_agent(int is_agent) {
+        this.is_agent = is_agent;
+    }
 }

app/src/main/java/com/sheep/gamegroup/model/util/SheepSubscriber.java

@@ -60,10 +60,7 @@ public abstract class SheepSubscriber<T> extends Subscriber<T> {
                  * token 过期
                  */
                 if(throwable.code == 401){
-                    SpUtils.login(SheepApp.mContext,"");
-                    G.showToast("请重新登录");
-                    ActivityManager.getInstance().finishAllActivity();
-                    Jump2View.getInstance().goLoginView(SheepApp.mContext, "");
+                    Jump2View.getInstance().gotoLoginAgain();
                     return;
                 }
                 BaseMessage baseMessage;

app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -991,5 +991,13 @@ public class Jump2View {
         context.startActivity(intent);
     }
 
-
+    /**
+     * 重新登录
+     */
+    public void gotoLoginAgain() {
+        SpUtils.login(SheepApp.mContext,"");
+        G.showToast("请重新登录");
+        ActivityManager.getInstance().finishAllActivity();
+        Jump2View.getInstance().goLoginView(SheepApp.mContext, "");
+    }
 }

app/src/main/java/com/sheep/gamegroup/view/activity/ActWeb.java

@@ -14,6 +14,8 @@ import android.webkit.WebViewClient;
 import android.widget.TextView;
 
 import com.kfzs.duanduan.BaseCompatActivity;
+import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 import com.sheep.jiuyan.samllsheep.utils.G;
@@ -101,17 +103,19 @@ public class ActWeb extends BaseCompatActivity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        mWebView.setVisibility(View.GONE);
-        mWebView.removeAllViews();
-        mWebView.destroy();
+        if(mWebView != null) {
+            mWebView.setVisibility(View.GONE);
+            mWebView.removeAllViews();
+            mWebView.destroy();
+        }
     }
 
     private void loadUrl() {
-        mWebView.setWebChromeClient(new WebChromeClient(){
+        mWebView.setWebChromeClient(new WebChromeClient() {
             @Override
             public void onReceivedTitle(WebView view, String title) {
                 super.onReceivedTitle(view, title);
-                if(title == null)
+                if (title == null)
                     TitleBarUtils
                             .getInstance()
                             .setTitle(ActWeb.this, title);
@@ -127,6 +131,7 @@ public class ActWeb extends BaseCompatActivity {
                 }
                 return true;
             }
+
             @Override
             public void onPageFinished(WebView view, String url) {
                 super.onPageFinished(view, url);
@@ -134,23 +139,34 @@ public class ActWeb extends BaseCompatActivity {
         });
         webViewSettings.setJavaScriptEnabled(true);
         mWebView.addJavascriptInterface(new KFZSJs(), "kfzsjs");
-        mWebView.loadUrl(addUrl(url,"authorization", SpUtils.getOpenId(this)));
+        String loadUrl = addUrl(url, "authorization", SpUtils.getOpenId(this));
+        LogUtil.println("ActWeb loadUrl = "+loadUrl);
+        mWebView.loadUrl(loadUrl);
     }
-    private String addUrl(String url, String key, String value){
-        return  url + (url.contains("?") || url.contains("#") ? "&" : "?")+key+"="+value;
+
+    private String addUrl(String url, String key, String value) {
+        return url + ((url.contains("?") || url.contains("#") && url.contains("=")) ? "&" : "?") + key + "=" + value;
     }
-    public class KFZSJs{
+
+    public class KFZSJs {
         @JavascriptInterface
-        public void setTitle(String title){
-            TitleBarUtils
-                    .getInstance()
-                    .setTitle(ActWeb.this, title);
+        public void setTitle(final String title) {
+            runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    TitleBarUtils
+                            .getInstance()
+                            .setTitle(ActWeb.this, title);
+                }
+            });
         }
+
         @JavascriptInterface
-        public void setCanGoBack(){
+        public void setCanGoBack() {
         }
+
         @JavascriptInterface
-        public void downloadFile(final String url, final String name){
+        public void downloadFile(final String url, final String name) {
             OkHttpUtils.get()
                     .url(url)
                     .build()
@@ -162,7 +178,7 @@ public class ActWeb extends BaseCompatActivity {
 
                         @Override
                         public void onResponse(File response, int id) {
-                            if(name.endsWith(".png") || name.endsWith(".jpg")) {//图片
+                            if (name.endsWith(".png") || name.endsWith(".jpg")) {//图片
                                 Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
                                 Uri uri = Uri.fromFile(response);
                                 intent.setData(uri);
@@ -172,16 +188,23 @@ public class ActWeb extends BaseCompatActivity {
                         }
                     });
         }
+
         @JavascriptInterface
-        public void startApp(String pkg, String cls){
+        public void startApp(String pkg, String cls) {
             PackageUtil.startApp(ActWeb.this, pkg);
         }
 
+        @JavascriptInterface
+        public void gotoLogin() {
+            mWebView = null;
+            Jump2View.getInstance().gotoLoginAgain();
+        }
+
     }
 
     @Override
     public void finish() {
-        if(mWebView.canGoBack()){
+        if (mWebView != null && mWebView.canGoBack()) {
             mWebView.goBack();
             return;
         }

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

@@ -135,6 +135,7 @@
         android:id="@+id/proxy_service_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:visibility="gone"
         android:padding="15dp"
         >
         <ImageView

datashare/build.gradle

@@ -12,7 +12,7 @@ android {
     }
 
     greendao {
-        schemaVersion 7
+        schemaVersion 8
         targetGenDir 'src/main/java'
     }
     buildTypes {

datashare/src/main/java/com/kfzs/duanduan/data/graph/provider/channel/DaoMaster.java

@@ -18,10 +18,10 @@ import com.kfzs.duanduan.datashare.provider.download.DownLoadInfoDao;
 
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
 /**
- * Master of DAO (schema version 7): knows all DAOs.
+ * Master of DAO (schema version 8): knows all DAOs.
  */
 public class DaoMaster extends AbstractDaoMaster {
-    public static final int SCHEMA_VERSION = 7;
+    public static final int SCHEMA_VERSION = 8;
 
     /** Creates underlying database table using DAOs. */
     public static void createAllTables(Database db, boolean ifNotExists) {