Преглед на файлове

尝试修复可能出现的bug

zengjiebin преди 7 години
родител
ревизия
73359c9147

+ 7 - 3
app/src/main/java/com/kfzs/duanduan/fragment/AbsFgtMyMoney.java

@@ -1,5 +1,6 @@
 package com.kfzs.duanduan.fragment;
 
+import android.app.Activity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ListView;
@@ -45,12 +46,15 @@ public abstract class AbsFgtMyMoney extends BaseFragment {
 
     private List<ILog> list = ListUtil.emptyList();
     private ArrayAdapter<ILog> adapter;
+
+    private Activity activity;
     @Override
     public void onViewCreated() {
         ButterKnife.bind(this, mView);
-        if(getActivity() != null) {
-            swipe_container.setFooterView(getActivity(), list_view, R.layout.listview_footer);
-            adapter = new ArrayAdapter<ILog>(getActivity(), R.layout.x_my_money_act_layout_item, list){
+        activity = getActivity();
+        if(activity != null) {
+            swipe_container.setFooterView(activity, list_view, R.layout.listview_footer);
+            adapter = new ArrayAdapter<ILog>(activity, R.layout.x_my_money_act_layout_item, list){
                 @Override
                 public boolean convert(int position, View convertView, ViewGroup parent, ILog item) {
                     View my_money_item_top = convertView.findViewById(R.id.my_money_item_top);

+ 5 - 2
app/src/main/java/com/kfzs/duanduan/fragment/FgtCreditCardProgressQuery.java

@@ -1,5 +1,6 @@
 package com.kfzs.duanduan.fragment;
 
+import android.app.Activity;
 import android.view.View;
 import android.widget.ListView;
 
@@ -40,11 +41,13 @@ public class FgtCreditCardProgressQuery extends BaseFragment {
 
     private List<CreditCardProgressQuery> list = new ArrayList<>();
     private CreditCardProgressQueryAdp adapter;
+    private Activity activity;
     @Override
     public void onViewCreated() {
+        activity = getActivity();
         ButterKnife.bind(this, mView);
-        swipe_container.setFooterView(getActivity(), credit_card_task_list, R.layout.listview_footer);
-        adapter = new CreditCardProgressQueryAdp(getActivity(), list);
+        swipe_container.setFooterView(activity, credit_card_task_list, R.layout.listview_footer);
+        adapter = new CreditCardProgressQueryAdp(activity, list);
         credit_card_task_list.setAdapter(adapter);
         swipe_container.setOnRefreshListener(new RefreshLayout.OnRefreshListener() {
             @Override

+ 6 - 3
app/src/main/java/com/kfzs/duanduan/fragment/FgtCreditCardTaskList.java

@@ -1,5 +1,6 @@
 package com.kfzs.duanduan.fragment;
 
+import android.app.Activity;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListView;
@@ -43,11 +44,13 @@ public class FgtCreditCardTaskList extends BaseFragment {
 
     private List<TaskReleaseEty> list = new ArrayList<>();
     private CreditCardTaskAdp adapter;
+    private Activity activity;
     @Override
     public void onViewCreated() {
         ButterKnife.bind(this, mView);
-        swipe_container.setFooterView(getActivity(), credit_card_task_list, R.layout.listview_footer);
-        adapter = new CreditCardTaskAdp(getActivity(), list);
+        activity = getActivity();
+        swipe_container.setFooterView(activity, credit_card_task_list, R.layout.listview_footer);
+        adapter = new CreditCardTaskAdp(activity, list);
         credit_card_task_list.setAdapter(adapter);
         credit_card_task_list.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
@@ -71,7 +74,7 @@ public class FgtCreditCardTaskList extends BaseFragment {
     private void onItemClickTask(TaskReleaseEty taskReleaseEty) {
         taskReleaseEty.getTask().setBonus(taskReleaseEty.getBonus());
         taskReleaseEty.getTask().setName(taskReleaseEty.getName());
-        Jump2View.getInstance().goCreditCardTaskDetail(getActivity(), taskReleaseEty.getId());
+        Jump2View.getInstance().goCreditCardTaskDetail(activity, taskReleaseEty.getId());
     }
 
     private void initData() {

+ 3 - 1
app/src/main/java/com/kfzs/duanduan/fragment/FgtFriendExtractPage.java

@@ -39,9 +39,12 @@ public class FgtFriendExtractPage extends BaseFragment {
     }
 
     private List<Friend> list = new ArrayList<>();
+
+    private Activity activity;
     @Override
     public void onViewCreated() {
         ButterKnife.bind(this, mView);
+        activity = getActivity();
         initData();
     }
 
@@ -89,7 +92,6 @@ public class FgtFriendExtractPage extends BaseFragment {
                             baseMessage.setMsg("您还没有邀请到好友");
                             onError(baseMessage);
                         } else {
-                            Activity activity = getActivity();
                             if (activity instanceof AskGetMoneyAct) {
                                 ((AskGetMoneyAct) activity).setFriendExtractCount(baseMessage.getTotal(), page, friendList.size());
                             }

+ 19 - 16
app/src/main/java/com/kfzs/duanduan/fragment/FgtPersonalCenter.java

@@ -1,5 +1,6 @@
 package com.kfzs.duanduan.fragment;
 
+import android.app.Activity;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
@@ -68,9 +69,11 @@ public class FgtPersonalCenter extends BaseCompatFragment {
     private String faqUrl;
     private String agentUrl;
 
+    private Activity activity;
     @Override
     protected void initView(Bundle savedInstanceState) {
         setContentView(R.layout.fgt_personalcenter_layout);
+        activity = getActivity();
     }
 
     private void initData() {
@@ -155,7 +158,7 @@ public class FgtPersonalCenter extends BaseCompatFragment {
         personalcenter_item_price_tv.setText(userEntitys.getBalance() + " 元");
         nameTv.setText(userEntitys.getNickname() + "");//绵羊号:123456789
         sheepNumTv.setText("绵羊号:" + userEntitys.getInvitation_code());
-        Glide.with(getActivity())
+        Glide.with(activity)
                 .load(userEntitys.getAvatar() + "")
                 .apply(new RequestOptions().circleCrop().placeholder(R.drawable.icon))
                 .into(iconImgIv);
@@ -191,47 +194,47 @@ public class FgtPersonalCenter extends BaseCompatFragment {
         switch (view.getId()) {
             case R.id.icon_img_iv://图片
             case R.id.account_detail_layout://个人资料
-                Jump2View.getInstance().goPersionInfo(getActivity(), userEntitys);
+                Jump2View.getInstance().goPersionInfo(activity, userEntitys);
                 break;
             case R.id.personalcenter_price_layout://我的资产
-                Jump2View.getInstance().goMyMoney(getActivity(), null);
+                Jump2View.getInstance().goMyMoney(activity, null);
                 break;
             case R.id.account_safe_layout:
-                Jump2View.getInstance().goAccountAndSecurit(getActivity(), null);
+                Jump2View.getInstance().goAccountAndSecurit(activity, null);
                 break;
             case R.id.account_task_layout://任务记录
-                Jump2View.getInstance().goTaskList2View(getActivity(), null);
+                Jump2View.getInstance().goTaskList2View(activity, null);
                 break;
             case R.id.proxy_service_layout://代理
                 if (!TextUtils.isEmpty(agentUrl))
-                    Jump2View.getInstance().goWeb(getActivity(), agentUrl, "代理服务");
+                    Jump2View.getInstance().goWeb(activity, agentUrl, "代理服务");
                 else
                     G.showToast(R.string.loading_data);
                 break;
             case R.id.faq_layout://FAQ帮助
                 if (!TextUtils.isEmpty(faqUrl))
-                    Jump2View.getInstance().goWeb(getActivity(), faqUrl, "FAQ帮助");
+                    Jump2View.getInstance().goWeb(activity, faqUrl, "FAQ帮助");
                 else
-                    Jump2View.getInstance().goWeb(getActivity(), "http://smallstation.kfzs.com/h5_faq/#/faq", "FAQ帮助");
+                    Jump2View.getInstance().goWeb(activity, "http://smallstation.kfzs.com/h5_faq/#/faq", "FAQ帮助");
                 break;
             case R.id.abourt_us_layout://关于我们
-                Jump2View.getInstance().goNewAboutUs(getActivity());
+                Jump2View.getInstance().goNewAboutUs(activity);
                 break;
             case R.id.feedbook_layout://意见反馈
                 Jump2View.getInstance()
                         .goFeedbackAct(
-                                getActivity());
+                                activity);
                 break;
             case R.id.recommend_friend_layout://推荐给好友
                 if (Ety != null) {
-                    ViewUtil.shareLink(getActivity(), Ety.getShare_link());
+                    ViewUtil.shareLink(activity, Ety.getShare_link());
                 }
                 break;
             case R.id.version_layout://版本更新
-                SysAppUtil.showVersionInfo(getActivity(), null);
+                SysAppUtil.showVersionInfo(activity, null);
                 break;
             case R.id.clear_layout://清除缓存
-                ViewUtil.showMsgDialog(getActivity(), new DialogConfig().setTitle("清除缓存").setMsg("所有本地的缓存都会被清理").setBtnRightText("取消")
+                ViewUtil.showMsgDialog(activity, new DialogConfig().setTitle("清除缓存").setMsg("所有本地的缓存都会被清理").setBtnRightText("取消")
                 .setBtnLeftText("确定").setBtnLeftOnClickListener(new View.OnClickListener() {
                             @Override
                             public void onClick(View view) {
@@ -246,15 +249,15 @@ public class FgtPersonalCenter extends BaseCompatFragment {
                         }));
                 break;
             case R.id.change_layout://新功能介绍
-                Jump2View.getInstance().goVersionChange(getActivity(), ApkUtils.getCurrentPkgVersionName(SheepApp.getInstance()));
+                Jump2View.getInstance().goVersionChange(activity, ApkUtils.getCurrentPkgVersionName(SheepApp.getInstance()));
                 break;
             case R.id.tv_submit://注销
                 CommonUtil.getInstance()
-                        .loginOut((BaseActivity) getActivity());
+                        .loginOut((BaseActivity) activity);
                 break;
             case R.id.order_layout://订单管理
                 Jump2View.getInstance()
-                        .goGameTaskOrderList(getActivity());
+                        .goGameTaskOrderList(activity);
                 break;
         }
     }

+ 9 - 5
app/src/main/java/com/kfzs/duanduan/fragment/FgtSignRankings.java

@@ -1,5 +1,6 @@
 package com.kfzs.duanduan.fragment;
 
+import android.app.Activity;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.LinearLayoutManager;
@@ -61,13 +62,15 @@ public class FgtSignRankings extends BaseCompatFragment implements SignRankingsC
         fgtSignRankings.setArguments(bundle);
         return fgtSignRankings;
     }
-
+    private Activity activity;
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        type = getArguments().getInt("type", 0);
+        activity = getActivity();
+        if(getArguments() != null)
+            type = getArguments().getInt("type", 0);
         DaggerSignRankingsComponent.builder()
-                .netComponent(SheepApp.get(getActivity()).getNetComponent())
+                .netComponent(SheepApp.get(activity).getNetComponent())
                 .signRankingsModule(new SignRankingsModule(this))
                 .build()
                 .inject(this);
@@ -83,8 +86,9 @@ public class FgtSignRankings extends BaseCompatFragment implements SignRankingsC
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View rootView = super.onCreateView(inflater, container, savedInstanceState);
-        unbinder = ButterKnife.bind(this, rootView);
-        signRankingsRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
+        if(rootView != null)
+            unbinder = ButterKnife.bind(this, rootView);
+        signRankingsRecyclerView.setLayoutManager(new LinearLayoutManager(activity));
         switch (type){
             case 0://获取累计打卡
                 presenter.getTotalPunchTop();

+ 10 - 10
app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -212,17 +212,17 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     @Override
     protected void initView(Bundle savedInstanceState) {
         setContentView(R.layout.homepage_act_layout);
+        activity = getActivity();
         showPDialog();
         initView();
         initListener();
-        TestUtil.testChange(getActivity(), (TextView) getViewById(R.id.test_change));
-        TestUtil.testChangeUser(getActivity(), (TextView) getViewById(R.id.test_change_user));
+        TestUtil.testChange(activity, (TextView) getViewById(R.id.test_change));
+        TestUtil.testChangeUser(activity, (TextView) getViewById(R.id.test_change_user));
     }
 
 
     public void initView() {
         EventBus.getDefault().register(this);
-        activity = getActivity();
         ButterKnife.bind(this, mContentView);
         DaggerSmallSheepComponent.builder()
                 .netComponent(SheepApp.getInstance().getNetComponent())
@@ -359,14 +359,14 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     private void recyclerInitView() {
 
         recyclerview.setLayoutManager(new LinearLayoutManager(activity));
-        tryMakeMoneyAdp = new TryMakeMoneyAdp(getActivity());
+        tryMakeMoneyAdp = new TryMakeMoneyAdp(activity);
         for (int i = 0; i < 2; i++) {
             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
         }
         recyclerview.setAdapter(tryMakeMoneyAdp);
 
-        adpHomeListListview = new AdpHomeListListview(homeListEntitysListview, getActivity());
-        adpHomeListGrideview = new AdpHomeListGrideview(homeListEntitysGridview, getActivity());
+        adpHomeListListview = new AdpHomeListListview(homeListEntitysListview, activity);
+        adpHomeListGrideview = new AdpHomeListGrideview(homeListEntitysGridview, activity);
         home_list_gridview_listview.setAdapter(adpHomeListListview);
         home_list_gridview_gv.setAdapter(adpHomeListGrideview);
     }
@@ -435,7 +435,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 break;
             case R.id.icon_layout://
                 if(TestUtil.isTest()) {
-                    TestUtil.test(getActivity());
+                    TestUtil.test(activity);
                 }else
                     Jump2View.getInstance().goPersonnalCenterView(activity, null);
                 break;
@@ -751,10 +751,10 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             sb.append(TimeStamp2Date(entity.getTime())).append("   ");
             sb.append(entity.getName()).append("   ");
             sb.append(entity.getDesc());
-//            LinearLayout moreView = (LinearLayout) LayoutInflater.from(getActivity()).inflate(R.layout.x_item_view, null);
+//            LinearLayout moreView = (LinearLayout) LayoutInflater.from(activity).inflate(R.layout.x_item_view, null);
 //            TextView tv_desc = moreView.findViewById(R.id.tv_desc);
 //            tv_desc.setText(sb.toString());
-            TextView moreView = (TextView) LayoutInflater.from(getActivity()).inflate(R.layout.x_item_view, null);
+            TextView moreView = (TextView) LayoutInflater.from(activity).inflate(R.layout.x_item_view, null);
             moreView.setText(sb.toString());
             views.add(moreView);
             upview1.addView(moreView);
@@ -950,7 +950,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         for (BulletinEnty entity : bulletinEntyList) {
             StringBuilder sb = new StringBuilder();
             sb.append(entity.getContent()).append("   ");
-            TextView moreView = (TextView) LayoutInflater.from(getActivity()).inflate(R.layout.x_item_view, null);
+            TextView moreView = (TextView) LayoutInflater.from(activity).inflate(R.layout.x_item_view, null);
             moreView.setText(sb.toString());
             homepageItemNoticeMv.addView(moreView);
         }

+ 6 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/ActCreditCardWeb.java

@@ -116,6 +116,12 @@ public class ActCreditCardWeb extends BaseCompatActivity {
 //                loadTestJs();
             }
         });
+
+        // 开启DOM缓存,开启LocalStorage存储(html5的本地存储方式)
+        webViewSettings.setDomStorageEnabled(true);
+        webViewSettings.setDatabaseEnabled(true);
+        webViewSettings.setDatabasePath(getApplicationContext().getCacheDir().getAbsolutePath());
+
         webViewSettings.setJavaScriptEnabled(true);
         mWebView.addJavascriptInterface(new WebviewJs(ActCreditCardWeb.this, 0), "kfzsjs");
         mWebView.loadUrl(creditCard.getLoadUrl());

+ 48 - 45
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtGameMakeMoney.java

@@ -117,14 +117,15 @@ public class FgtGameMakeMoney extends BaseFragment implements TryMakeMoneyContra
 
     @Override
     public void onViewCreated() {
+        activity = getActivity();
 
         initView();
     }
 
     public void initView() {
-        is_succession = ((GamemakeMoneyAct)getActivity()).getIsSuccession();//0:一般任务 1:连续任务
+        if(activity instanceof GamemakeMoneyAct)
+            is_succession = ((GamemakeMoneyAct) activity).getIsSuccession();//0:一般任务 1:连续任务
         EventBus.getDefault().register(this);
-        activity = getActivity();
         DaggerFgtMakeMoneyComponent.builder()
                 .netComponent(SheepApp.get(activity).getNetComponent())
                 .tryMakeMoneyModule(new TryMakeMoneyModule(FgtGameMakeMoney.this))
@@ -183,53 +184,55 @@ public class FgtGameMakeMoney extends BaseFragment implements TryMakeMoneyContra
         }
         tryMakeMoneyAdp.setTaskAcceptedEty(null);
         tryMakeMoneyAdp.setIs_succession(is_succession);
-        gridViewEntity = ((GamemakeMoneyAct)getActivity()).getTabValue();
-        if(getActivity() instanceof  GamemakeMoneyAct)
-            SheepApp.getInstance()
-                .getNetComponent()
-                .getApiService()
-                .run_game_task()
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
-                        @Override
-                        public void onError(BaseMessage baseMessage) {
-                            hideProgress();
-                            try {
-                                switch (baseMessage.getCode()){
-                                    case 300://未查询到数据
-                                        G.showToast(" 未查询到数据!");
-                                        break;
-                                    default:
-                                        G.showToast(" 网络错误!");
-                                        break;
+        if(activity instanceof GamemakeMoneyAct) {
+            gridViewEntity = ((GamemakeMoneyAct) activity).getTabValue();
+            if (activity instanceof GamemakeMoneyAct)
+                SheepApp.getInstance()
+                        .getNetComponent()
+                        .getApiService()
+                        .run_game_task()
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
+                            @Override
+                            public void onError(BaseMessage baseMessage) {
+                                hideProgress();
+                                try {
+                                    switch (baseMessage.getCode()) {
+                                        case 300://未查询到数据
+                                            G.showToast(" 未查询到数据!");
+                                            break;
+                                        default:
+                                            G.showToast(" 网络错误!");
+                                            break;
+                                    }
+                                } catch (Exception e) {
+                                    e.printStackTrace();
+                                    G.showToast(" 网络错误!");
                                 }
-                            }catch (Exception e){
-                                e.printStackTrace();
-                                G.showToast(" 网络错误!");
-                            }
-                            getNetWork(type);
+                                getNetWork(type);
 //                            notifyDataSetChanged();
-                        }
-
-                        @Override
-                        public void onNext(BaseMessage baseMessage) {
-                            hideProgress();
-                            try{
-                                List<TaskAcceptedEty> taskAcceptedEty = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), TaskAcceptedEty.class);
-                                if(taskAcceptedEty != null && taskAcceptedEty.size()>0){
-                                    tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, taskAcceptedEty),0);
-                                    tryMakeMoneyAdp.addPresenter(presenter);
-                                    position ++;
-                                }
-                            }catch (Exception e){
-                                e.printStackTrace();
                             }
-                            getNetWork(type);
-                            notifyDataSetChanged();
 
-                        }
-                    });
+                            @Override
+                            public void onNext(BaseMessage baseMessage) {
+                                hideProgress();
+                                try {
+                                    List<TaskAcceptedEty> taskAcceptedEty = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), TaskAcceptedEty.class);
+                                    if (taskAcceptedEty != null && taskAcceptedEty.size() > 0) {
+                                        tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, taskAcceptedEty), 0);
+                                        tryMakeMoneyAdp.addPresenter(presenter);
+                                        position++;
+                                    }
+                                } catch (Exception e) {
+                                    e.printStackTrace();
+                                }
+                                getNetWork(type);
+                                notifyDataSetChanged();
+
+                            }
+                        });
+        }
     }
 
     @Override

+ 10 - 8
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtTryMakeMoney.java

@@ -1,6 +1,5 @@
 package com.sheep.gamegroup.view.fragment;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.widget.SwipeRefreshLayout;
@@ -59,7 +58,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
 
     @Inject
     TryMakeMoneyPresenter presenter;
-    private Activity activity;
+    private TryMakeMoneyact activity;
     private TryMakeMoneyAdp tryMakeMoneyAdp;
     private int position = 0;
     private List<TaskReleaseEty> releaseEtyLists = new ArrayList<>();
@@ -128,9 +127,12 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
 //        initListener();
 //    }
     public void initView() {
-        is_succession = ((TryMakeMoneyact)getActivity()).getIsSuccession();//0:一般任务 1:连续任务
+        activity = (TryMakeMoneyact) getActivity();
+        if(activity == null){
+            return;
+        }
+        is_succession = activity.getIsSuccession();//0:一般任务 1:连续任务
         EventBus.getDefault().register(this);
-        activity = getActivity();
 //        ButterKnife.bind(this, mContentView);
         DaggerFgtTryMakeMoneyComponent.builder()
                 .netComponent(SheepApp.get(activity).getNetComponent())
@@ -190,9 +192,9 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         }
         tryMakeMoneyAdp.setTaskAcceptedEty(null);
         tryMakeMoneyAdp.setIs_succession(is_succession);
-        gridViewEntity = ((TryMakeMoneyact)getActivity()).getTabValue();
-        if(getActivity() instanceof  TryMakeMoneyact)
-            CommonUtil.getInstance().getRunTask(presenter,((TryMakeMoneyact)getActivity()).getIsSuccession());
+        gridViewEntity = activity.getTabValue();
+        if(activity instanceof  TryMakeMoneyact)
+            CommonUtil.getInstance().getRunTask(presenter,activity.getIsSuccession());
     }
 
     @Override
@@ -436,7 +438,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
                                 0,
                                 type,
                                 -1+"",
-                                ((TryMakeMoneyact)getActivity()).getIsSuccession()));
+                                activity.getIsSuccession()));
         presenter.releaseTask(parameEty);
     }
 }