Coding 企业版最后一个版本

Author: aaron

app/build.gradle

@@ -71,7 +71,7 @@ android {
             dimension "mode"
             applicationId "net.coding.program.enterprise"
             versionCode 298
-            versionName "2.9.8.20190219.1"
+            versionName "2.9.8.20190221.1"
             targetSdkVersion 21
 
             // 信鸽依赖

app/src/enterprise/java/net/coding/program/EnterpriseApp.java

@@ -47,9 +47,9 @@ public static void setHost(@NonNull String enterpriseName) {
         AccountInfo.CustomHost customHost = AccountInfo.getCustomHost(GlobalData.getInstance());
         if (customHost.getHost().equalsIgnoreCase("s")) {
             if (TextUtils.isEmpty(enterpriseName)) {
-                host = "http://e.coding.codingprod.net";
+                host = "http://e.coding.e.codingprod.net";
             } else {
-                host = String.format("http://%s.coding.codingprod.net", enterpriseName);
+                host = String.format("http://%s.coding.e.codingprod.net", enterpriseName);
             }
         } else {
             if (enterpriseName.isEmpty()) {

app/src/enterprise/java/net/coding/program/project/EnterpriseProjectFragment.java

@@ -84,6 +84,12 @@ public class EnterpriseProjectFragment extends BaseFragment {
     @ViewById
     View toolbarTitle;
 
+    @ViewById
+    View topTip, closeTipButton;
+
+    @ViewById
+    TextView topTipText;
+
     ArrayList<ProjectObject> listData = new ArrayList<>();
     ArrayList<ProjectObject> allListData = new ArrayList<>();
 
@@ -145,6 +151,18 @@ void initEnterpriseProjectFramgent() {
         onRefresh();
 
         setHasOptionsMenu(true);
+
+        if (GlobalData.isPrivateEnterprise()) {
+            topTip.setVisibility(View.GONE);
+        } else {
+            soldOutTip();
+        }
+    }
+
+    private void soldOutTip() {
+        topTip.setVisibility(View.VISIBLE);
+        closeTipButton.setOnClickListener(v -> topTip.setVisibility(View.GONE));
+        topTipText.setText(R.string.sold_out_app);
     }
 
     private void initActionBar() {

app/src/enterprise/java/net/coding/program/setting/EnterpriseAccountActivity.java

@@ -10,6 +10,8 @@
 import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.ImageLoader;
 
+import de.hdodenhof.circleimageview.CircleImageView;
+
 import net.coding.program.R;
 import net.coding.program.common.Global;
 import net.coding.program.common.GlobalData;
@@ -30,8 +32,6 @@
 import org.androidannotations.annotations.res.ColorRes;
 import org.json.JSONObject;
 
-import de.hdodenhof.circleimageview.CircleImageView;
-
 @EActivity(R.layout.activity_enterprise_account)
 @OptionsMenu(R.menu.enterprise_account_menu)
 public class EnterpriseAccountActivity extends BackActivity {
@@ -100,7 +100,7 @@ public void onMySuccess(JSONObject response) {
                 account = new EnterpriseAccount(response.optJSONObject("data"));
                 Spanned countString;
 
-                if (account.trial) { // 处于试用期
+                if (account.trial && !account.payed) { // 处于试用期
                     int fontColor = account.remaindays > 5 ? fontOragne : fontRed;
                     countString = Global.createColorHtml("试用期剩余 ", String.valueOf(account.remaindays), " 天", fontColor);
                 } else {

app/src/enterprise/java/net/coding/program/setting/order/OrderMainActivity.java

@@ -131,13 +131,9 @@ private void initHeader() {
         Spanned balanceContentString = empty;
         String balanceTipString = "";
 
-        if (account.trial) { // 处于试用期
-            if (account.remaindays > 5) {
-                warnString = Global.createColorHtml("您正在试用 Coding 企业版，试用期剩余 ", String.valueOf(account.remaindays), " 天", fontOragne);
-            } else {
-                warnString = Global.createColorHtml("您正在试用 Coding 企业版，试用期剩余 ", String.valueOf(account.remaindays), " 天", fontRed);
-            }
-            balanceTipString = String.format("试用期至 %s，剩余 %s 天", timeString, account.remaindays);
+        if (account.trial && !account.payed) { // 处于试用期
+            warnString = Global.createColorHtml("您正在免费试用 CODING 企业服务", fontOragne);
+            balanceTipString = String.format("预计可使用至 %s，剩余 %s 天", timeString, account.remaindays);
 
             if (account.payed) { // 试用期且付过费
                 balanceTitleString = new SpannedString("账户余额（元）");
@@ -158,7 +154,7 @@ private void initHeader() {
 
                     balanceTitleString = new SpannedString("账户余额（元）");
                     balanceContentString = Global.createColorHtml(account.balance, fontOragne);
-                    balanceTipString = String.format("余额预计可使用至 %s，剩余 %s 天", df.format(account.estimateDate), account.remaindays);
+                    balanceTipString = String.format("预计可使用至 %s，剩余 %s 天", df.format(account.estimateDate), account.remaindays);
 
                     showOrderAndRecord(true);
 

app/src/enterprise/res/layout/fragment_enterprise_project.xml

@@ -47,6 +47,8 @@
 
     </android.support.design.widget.AppBarLayout>
 
+    <include layout="@layout/top_tip" />
+
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"

common-coding/src/main/java/net/coding/program/common/url/UrlCreate.java

@@ -58,13 +58,13 @@ public static String gitUploadFile(String projectPath, String version, String pa
     }
 
     // 重编码2次，git服务器那边要求的
-    private static String encode2Pager(String path) {
+    public static String encode2Pager(String path) {
         if (path == null || path.isEmpty()) {
             path = "";
         }
 
         String dest = Global.encodeUtf8("/" + path);
-        dest = Global.encodeUtf8(dest);
+//        dest = Global.encodeUtf8(dest);
         return dest + "?";
     }
 
@@ -75,7 +75,7 @@ public static String pathEncode2(String path) {
         }
 
         String dest = Global.encodeUtf8("/" + path);
-        dest = Global.encodeUtf8(dest);
+//        dest = Global.encodeUtf8(dest);
         return dest;
     }
 
@@ -87,7 +87,7 @@ public static String pathEncode2NoSplite(String path) {
         }
 
         String dest = Global.encodeUtf8(path);
-        dest = Global.encodeUtf8(dest);
+//        dest = Global.encodeUtf8(dest);
         return dest;
     }
 }