liujiangyao 8 éve
szülő
commit
e4e9ab0685

+ 2 - 2
app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java

@@ -143,11 +143,11 @@ public class TaskDetailAct extends BaseActivity implements TaskDetailContract.Vi
             @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
-                view.loadUrl(request.getUrl().toString());
+                view.loadDataWithBaseURL(null,request.getUrl().toString(), "text/html", "utf-8", null);
                 return true;
             }
         });
-        webText.loadUrl(taskEty.getDesc());
+        webText.loadDataWithBaseURL(null,taskEty.getDesc(), "text/html", "utf-8", null);
         nameTv.setText(taskEty.getName()+"");
         priceTv.setText("+"+ taskEty.getBonus() +"元");
         dateTv.setText(TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(taskEty.getUpdate_time()))+"");

+ 4 - 3
app/src/main/java/com/sheep/jiuyan/samllsheep/page/SplashActivity.java

@@ -87,14 +87,15 @@ public class SplashActivity extends BaseActivity {
 
 
     private  void  goMain(){
-        SpUtils.login(getApplicationContext(), "12@1c421522bb7e44d3cd6a8d59a54df182");
+//        SpUtils.login(getApplicationContext(), "12@1c421522bb7e44d3cd6a8d59a54df182");
         String openId = SpUtils.getOpenId(getApplicationContext());
         if (!TextUtils.isEmpty(openId)) {
 //            Jump2View.getInstance().goHomePageView(SplashActivity.this, null);
-            startActivity(new Intent(this, ActMain.class));
+            startActivity(new Intent(this, MainActivity.class));
             finish();
         } else {
-            Jump2View.getInstance().goLoginView(SplashActivity.this, null);
+            startActivity(new Intent(this, LoginActivity.class));
+            finish();
             finish();
         }
 

+ 3 - 0
app/src/main/res/layout/task_detail_layout.xml

@@ -136,6 +136,9 @@
 
                     </LinearLayout>
                 </LinearLayout>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/layout_heigh_large"/>
             </LinearLayout>
         </ScrollView>